diff --git a/src/oci/access_governance_cp/access_governance_cp_client.py b/src/oci/access_governance_cp/access_governance_cp_client.py index de79a47e6c..8cd8a83512 100644 --- a/src/oci/access_governance_cp/access_governance_cp_client.py +++ b/src/oci/access_governance_cp/access_governance_cp_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_governance_instance_compartment(self, governance_instance_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_governance_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_governance_instance_compartment(self, governance_instance_id, change_ "governanceInstanceId": governance_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_governance_instance_compartment(self, governance_instance_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_governance_instance(self, create_governance_instance_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_governance_instance got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_governance_instance(self, create_governance_instance_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def delete_governance_instance(self, governance_instance_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_governance_instance got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def delete_governance_instance(self, governance_instance_id, **kwargs): "governanceInstanceId": governance_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def delete_governance_instance(self, governance_instance_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -491,7 +490,7 @@ def get_governance_instance(self, governance_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_governance_instance got unknown kwargs: {extra_kwargs!r}") @@ -500,10 +499,10 @@ def get_governance_instance(self, governance_instance_id, **kwargs): "governanceInstanceId": governance_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -511,7 +510,7 @@ def get_governance_instance(self, governance_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def get_governance_instance_configuration(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_governance_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -597,14 +596,14 @@ def get_governance_instance_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -714,7 +713,7 @@ def list_governance_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_governance_instances got unknown kwargs: {extra_kwargs!r}") @@ -743,14 +742,14 @@ def list_governance_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -839,7 +838,7 @@ def update_governance_instance(self, update_governance_instance_details, governa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_governance_instance got unknown kwargs: {extra_kwargs!r}") @@ -848,10 +847,10 @@ def update_governance_instance(self, update_governance_instance_details, governa "governanceInstanceId": governance_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -860,7 +859,7 @@ def update_governance_instance(self, update_governance_instance_details, governa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -951,7 +950,7 @@ def update_governance_instance_configuration(self, update_governance_instance_co "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_governance_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -959,7 +958,7 @@ def update_governance_instance_configuration(self, update_governance_instance_co query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -967,7 +966,7 @@ def update_governance_instance_configuration(self, update_governance_instance_co "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/adm/application_dependency_management_client.py b/src/oci/adm/application_dependency_management_client.py index d986b7caad..cf02567a76 100644 --- a/src/oci/adm/application_dependency_management_client.py +++ b/src/oci/adm/application_dependency_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def activate_remediation_recipe(self, remediation_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def activate_remediation_recipe(self, remediation_recipe_id, **kwargs): "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def activate_remediation_recipe(self, remediation_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def cancel_remediation_run(self, remediation_run_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_remediation_run got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def cancel_remediation_run(self, remediation_run_id, **kwargs): "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -303,7 +302,7 @@ def cancel_remediation_run(self, remediation_run_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -413,7 +412,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -510,7 +509,7 @@ def change_knowledge_base_compartment(self, knowledge_base_id, change_knowledge_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_knowledge_base_compartment got unknown kwargs: {extra_kwargs!r}") @@ -519,10 +518,10 @@ def change_knowledge_base_compartment(self, knowledge_base_id, change_knowledge_ "knowledgeBaseId": knowledge_base_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -532,7 +531,7 @@ def change_knowledge_base_compartment(self, knowledge_base_id, change_knowledge_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -632,7 +631,7 @@ def change_remediation_recipe_compartment(self, remediation_recipe_id, change_re "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_remediation_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -641,10 +640,10 @@ def change_remediation_recipe_compartment(self, remediation_recipe_id, change_re "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -654,7 +653,7 @@ def change_remediation_recipe_compartment(self, remediation_recipe_id, change_re "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -752,7 +751,7 @@ def change_remediation_run_compartment(self, remediation_run_id, change_remediat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_remediation_run_compartment got unknown kwargs: {extra_kwargs!r}") @@ -761,10 +760,10 @@ def change_remediation_run_compartment(self, remediation_run_id, change_remediat "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -774,7 +773,7 @@ def change_remediation_run_compartment(self, remediation_run_id, change_remediat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -872,7 +871,7 @@ def change_vulnerability_audit_compartment(self, vulnerability_audit_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vulnerability_audit_compartment got unknown kwargs: {extra_kwargs!r}") @@ -881,10 +880,10 @@ def change_vulnerability_audit_compartment(self, vulnerability_audit_id, change_ "vulnerabilityAuditId": vulnerability_audit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -894,7 +893,7 @@ def change_vulnerability_audit_compartment(self, vulnerability_audit_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -981,7 +980,7 @@ def create_knowledge_base(self, create_knowledge_base_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_knowledge_base got unknown kwargs: {extra_kwargs!r}") @@ -992,7 +991,7 @@ def create_knowledge_base(self, create_knowledge_base_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1077,7 +1076,7 @@ def create_remediation_recipe(self, create_remediation_recipe_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1088,7 +1087,7 @@ def create_remediation_recipe(self, create_remediation_recipe_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1173,7 +1172,7 @@ def create_remediation_run(self, create_remediation_run_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_remediation_run got unknown kwargs: {extra_kwargs!r}") @@ -1184,7 +1183,7 @@ def create_remediation_run(self, create_remediation_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1279,7 +1278,7 @@ def create_vulnerability_audit(self, create_vulnerability_audit_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vulnerability_audit got unknown kwargs: {extra_kwargs!r}") @@ -1291,7 +1290,7 @@ def create_vulnerability_audit(self, create_vulnerability_audit_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1380,7 +1379,7 @@ def deactivate_remediation_recipe(self, remediation_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1389,10 +1388,10 @@ def deactivate_remediation_recipe(self, remediation_recipe_id, **kwargs): "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1401,7 +1400,7 @@ def deactivate_remediation_recipe(self, remediation_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1487,7 +1486,7 @@ def delete_knowledge_base(self, knowledge_base_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_knowledge_base got unknown kwargs: {extra_kwargs!r}") @@ -1496,10 +1495,10 @@ def delete_knowledge_base(self, knowledge_base_id, **kwargs): "knowledgeBaseId": knowledge_base_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1508,7 +1507,7 @@ def delete_knowledge_base(self, knowledge_base_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1594,7 +1593,7 @@ def delete_remediation_recipe(self, remediation_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1603,10 +1602,10 @@ def delete_remediation_recipe(self, remediation_recipe_id, **kwargs): "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1615,7 +1614,7 @@ def delete_remediation_recipe(self, remediation_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1699,7 +1698,7 @@ def delete_remediation_run(self, remediation_run_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_remediation_run got unknown kwargs: {extra_kwargs!r}") @@ -1708,10 +1707,10 @@ def delete_remediation_run(self, remediation_run_id, **kwargs): "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1720,7 +1719,7 @@ def delete_remediation_run(self, remediation_run_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1804,7 +1803,7 @@ def delete_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vulnerability_audit got unknown kwargs: {extra_kwargs!r}") @@ -1813,10 +1812,10 @@ def delete_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "vulnerabilityAuditId": vulnerability_audit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1825,7 +1824,7 @@ def delete_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1903,7 +1902,7 @@ def get_knowledge_base(self, knowledge_base_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_knowledge_base got unknown kwargs: {extra_kwargs!r}") @@ -1912,10 +1911,10 @@ def get_knowledge_base(self, knowledge_base_id, **kwargs): "knowledgeBaseId": knowledge_base_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1923,7 +1922,7 @@ def get_knowledge_base(self, knowledge_base_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2003,7 +2002,7 @@ def get_remediation_recipe(self, remediation_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2012,10 +2011,10 @@ def get_remediation_recipe(self, remediation_recipe_id, **kwargs): "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2023,7 +2022,7 @@ def get_remediation_recipe(self, remediation_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2101,7 +2100,7 @@ def get_remediation_run(self, remediation_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_remediation_run got unknown kwargs: {extra_kwargs!r}") @@ -2110,10 +2109,10 @@ def get_remediation_run(self, remediation_run_id, **kwargs): "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2121,7 +2120,7 @@ def get_remediation_run(self, remediation_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2204,7 +2203,7 @@ def get_stage(self, remediation_run_id, stage_type, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stage got unknown kwargs: {extra_kwargs!r}") @@ -2214,10 +2213,10 @@ def get_stage(self, remediation_run_id, stage_type, **kwargs): "stageType": stage_type } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2225,7 +2224,7 @@ def get_stage(self, remediation_run_id, stage_type, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2303,7 +2302,7 @@ def get_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vulnerability_audit got unknown kwargs: {extra_kwargs!r}") @@ -2312,10 +2311,10 @@ def get_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "vulnerabilityAuditId": vulnerability_audit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2323,7 +2322,7 @@ def get_vulnerability_audit(self, vulnerability_audit_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2403,7 +2402,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2412,10 +2411,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2423,7 +2422,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2535,7 +2534,7 @@ def list_application_dependency_recommendations(self, remediation_run_id, **kwar "purl", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_application_dependency_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -2544,10 +2543,10 @@ def list_application_dependency_recommendations(self, remediation_run_id, **kwar "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2572,14 +2571,14 @@ def list_application_dependency_recommendations(self, remediation_run_id, **kwar "purl": kwargs.get("purl", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2721,7 +2720,7 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** "purl", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_application_dependency_vulnerabilities got unknown kwargs: {extra_kwargs!r}") @@ -2730,10 +2729,10 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** "vulnerabilityAuditId": vulnerability_audit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'severity_greater_than_or_equal' in kwargs: @@ -2771,14 +2770,14 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** "gav": kwargs.get("gav", missing), "purl": kwargs.get("purl", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2899,7 +2898,7 @@ def list_knowledge_bases(self, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_knowledge_bases got unknown kwargs: {extra_kwargs!r}") @@ -2935,14 +2934,14 @@ def list_knowledge_bases(self, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3063,7 +3062,7 @@ def list_remediation_recipes(self, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_remediation_recipes got unknown kwargs: {extra_kwargs!r}") @@ -3099,14 +3098,14 @@ def list_remediation_recipes(self, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3232,7 +3231,7 @@ def list_remediation_runs(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_remediation_runs got unknown kwargs: {extra_kwargs!r}") @@ -3269,14 +3268,14 @@ def list_remediation_runs(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3391,7 +3390,7 @@ def list_stages(self, remediation_run_id, **kwargs): "opc_request_id", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stages got unknown kwargs: {extra_kwargs!r}") @@ -3400,10 +3399,10 @@ def list_stages(self, remediation_run_id, **kwargs): "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'type' in kwargs: @@ -3442,14 +3441,14 @@ def list_stages(self, remediation_run_id, **kwargs): "page": kwargs.get("page", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3599,7 +3598,7 @@ def list_vulnerability_audits(self, **kwargs): "time_created_less_than_or_equal_to", "max_observed_severity_greater_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vulnerability_audits got unknown kwargs: {extra_kwargs!r}") @@ -3647,14 +3646,14 @@ def list_vulnerability_audits(self, **kwargs): "timeCreatedLessThanOrEqualTo": kwargs.get("time_created_less_than_or_equal_to", missing), "maxObservedSeverityGreaterThanOrEqualTo": kwargs.get("max_observed_severity_greater_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3754,7 +3753,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3763,10 +3762,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3789,14 +3788,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3898,7 +3897,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3907,10 +3906,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3933,14 +3932,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4058,7 +4057,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4094,14 +4093,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4192,7 +4191,7 @@ def update_knowledge_base(self, knowledge_base_id, update_knowledge_base_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_knowledge_base got unknown kwargs: {extra_kwargs!r}") @@ -4201,10 +4200,10 @@ def update_knowledge_base(self, knowledge_base_id, update_knowledge_base_details "knowledgeBaseId": knowledge_base_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4213,7 +4212,7 @@ def update_knowledge_base(self, knowledge_base_id, update_knowledge_base_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4304,7 +4303,7 @@ def update_remediation_recipe(self, remediation_recipe_id, update_remediation_re "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_remediation_recipe got unknown kwargs: {extra_kwargs!r}") @@ -4313,10 +4312,10 @@ def update_remediation_recipe(self, remediation_recipe_id, update_remediation_re "remediationRecipeId": remediation_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4325,7 +4324,7 @@ def update_remediation_recipe(self, remediation_recipe_id, update_remediation_re "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4414,7 +4413,7 @@ def update_remediation_run(self, remediation_run_id, update_remediation_run_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_remediation_run got unknown kwargs: {extra_kwargs!r}") @@ -4423,10 +4422,10 @@ def update_remediation_run(self, remediation_run_id, update_remediation_run_deta "remediationRunId": remediation_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4435,7 +4434,7 @@ def update_remediation_run(self, remediation_run_id, update_remediation_run_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4526,7 +4525,7 @@ def update_vulnerability_audit(self, vulnerability_audit_id, update_vulnerabilit "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vulnerability_audit got unknown kwargs: {extra_kwargs!r}") @@ -4535,10 +4534,10 @@ def update_vulnerability_audit(self, vulnerability_audit_id, update_vulnerabilit "vulnerabilityAuditId": vulnerability_audit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4547,7 +4546,7 @@ def update_vulnerability_audit(self, vulnerability_audit_id, update_vulnerabilit "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ai_anomaly_detection/anomaly_detection_client.py b/src/oci/ai_anomaly_detection/anomaly_detection_client.py index bbedefe642..3c48209187 100644 --- a/src/oci/ai_anomaly_detection/anomaly_detection_client.py +++ b/src/oci/ai_anomaly_detection/anomaly_detection_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def change_ai_private_endpoint_compartment(self, ai_private_endpoint_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ai_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -293,10 +292,10 @@ def change_ai_private_endpoint_compartment(self, ai_private_endpoint_id, change_ "aiPrivateEndpointId": ai_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -306,7 +305,7 @@ def change_ai_private_endpoint_compartment(self, ai_private_endpoint_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -404,7 +403,7 @@ def change_data_asset_compartment(self, data_asset_id, change_data_asset_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_data_asset_compartment got unknown kwargs: {extra_kwargs!r}") @@ -413,10 +412,10 @@ def change_data_asset_compartment(self, data_asset_id, change_data_asset_compart "dataAssetId": data_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -426,7 +425,7 @@ def change_data_asset_compartment(self, data_asset_id, change_data_asset_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -518,7 +517,7 @@ def change_detect_anomaly_job_compartment(self, detect_anomaly_job_id, change_de "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_detect_anomaly_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -527,10 +526,10 @@ def change_detect_anomaly_job_compartment(self, detect_anomaly_job_id, change_de "detectAnomalyJobId": detect_anomaly_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -539,7 +538,7 @@ def change_detect_anomaly_job_compartment(self, detect_anomaly_job_id, change_de "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -636,7 +635,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -645,10 +644,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -658,7 +657,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -756,7 +755,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -765,10 +764,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -778,7 +777,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -865,7 +864,7 @@ def create_ai_private_endpoint(self, create_ai_private_endpoint_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -876,7 +875,7 @@ def create_ai_private_endpoint(self, create_ai_private_endpoint_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -961,7 +960,7 @@ def create_data_asset(self, create_data_asset_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -972,7 +971,7 @@ def create_data_asset(self, create_data_asset_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1067,7 +1066,7 @@ def create_detect_anomaly_job(self, create_detect_anomaly_job_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_detect_anomaly_job got unknown kwargs: {extra_kwargs!r}") @@ -1078,7 +1077,7 @@ def create_detect_anomaly_job(self, create_detect_anomaly_job_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1165,7 +1164,7 @@ def create_model(self, create_model_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -1176,7 +1175,7 @@ def create_model(self, create_model_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1263,7 +1262,7 @@ def create_project(self, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -1274,7 +1273,7 @@ def create_project(self, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1361,7 +1360,7 @@ def delete_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1370,10 +1369,10 @@ def delete_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "aiPrivateEndpointId": ai_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1382,7 +1381,7 @@ def delete_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1466,7 +1465,7 @@ def delete_data_asset(self, data_asset_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -1475,10 +1474,10 @@ def delete_data_asset(self, data_asset_id, **kwargs): "dataAssetId": data_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1487,7 +1486,7 @@ def delete_data_asset(self, data_asset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1571,7 +1570,7 @@ def delete_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_detect_anomaly_job got unknown kwargs: {extra_kwargs!r}") @@ -1580,10 +1579,10 @@ def delete_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "detectAnomalyJobId": detect_anomaly_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1592,7 +1591,7 @@ def delete_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1676,7 +1675,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -1685,10 +1684,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1697,7 +1696,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1781,7 +1780,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -1790,10 +1789,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1802,7 +1801,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1902,7 +1901,7 @@ def detect_anomalies(self, detect_anomalies_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_anomalies got unknown kwargs: {extra_kwargs!r}") @@ -1914,7 +1913,7 @@ def detect_anomalies(self, detect_anomalies_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1993,7 +1992,7 @@ def get_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2002,10 +2001,10 @@ def get_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "aiPrivateEndpointId": ai_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2013,7 +2012,7 @@ def get_ai_private_endpoint(self, ai_private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2091,7 +2090,7 @@ def get_data_asset(self, data_asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -2100,10 +2099,10 @@ def get_data_asset(self, data_asset_id, **kwargs): "dataAssetId": data_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2111,7 +2110,7 @@ def get_data_asset(self, data_asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2189,7 +2188,7 @@ def get_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_detect_anomaly_job got unknown kwargs: {extra_kwargs!r}") @@ -2198,10 +2197,10 @@ def get_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "detectAnomalyJobId": detect_anomaly_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2209,7 +2208,7 @@ def get_detect_anomaly_job(self, detect_anomaly_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2287,7 +2286,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -2296,10 +2295,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2307,7 +2306,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2385,7 +2384,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -2394,10 +2393,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2405,7 +2404,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2483,7 +2482,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2492,10 +2491,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2503,7 +2502,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2616,7 +2615,7 @@ def list_ai_private_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ai_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -2652,14 +2651,14 @@ def list_ai_private_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2772,7 +2771,7 @@ def list_data_assets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_assets got unknown kwargs: {extra_kwargs!r}") @@ -2808,14 +2807,14 @@ def list_data_assets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2936,7 +2935,7 @@ def list_detect_anomaly_jobs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_detect_anomaly_jobs got unknown kwargs: {extra_kwargs!r}") @@ -2974,14 +2973,14 @@ def list_detect_anomaly_jobs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3097,7 +3096,7 @@ def list_models(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -3133,14 +3132,14 @@ def list_models(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3252,7 +3251,7 @@ def list_projects(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -3287,14 +3286,14 @@ def list_projects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3380,7 +3379,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3389,24 +3388,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3494,7 +3493,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3503,24 +3502,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3612,7 +3611,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3623,14 +3622,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3719,7 +3718,7 @@ def update_ai_private_endpoint(self, ai_private_endpoint_id, update_ai_private_e "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3728,10 +3727,10 @@ def update_ai_private_endpoint(self, ai_private_endpoint_id, update_ai_private_e "aiPrivateEndpointId": ai_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3740,7 +3739,7 @@ def update_ai_private_endpoint(self, ai_private_endpoint_id, update_ai_private_e "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3829,7 +3828,7 @@ def update_data_asset(self, data_asset_id, update_data_asset_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -3838,10 +3837,10 @@ def update_data_asset(self, data_asset_id, update_data_asset_details, **kwargs): "dataAssetId": data_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3850,7 +3849,7 @@ def update_data_asset(self, data_asset_id, update_data_asset_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3941,7 +3940,7 @@ def update_detect_anomaly_job(self, detect_anomaly_job_id, update_detect_anomaly "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_detect_anomaly_job got unknown kwargs: {extra_kwargs!r}") @@ -3950,10 +3949,10 @@ def update_detect_anomaly_job(self, detect_anomaly_job_id, update_detect_anomaly "detectAnomalyJobId": detect_anomaly_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3962,7 +3961,7 @@ def update_detect_anomaly_job(self, detect_anomaly_job_id, update_detect_anomaly "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4053,7 +4052,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -4062,10 +4061,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4074,7 +4073,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4163,7 +4162,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -4172,10 +4171,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4184,7 +4183,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ai_document/ai_service_document_client.py b/src/oci/ai_document/ai_service_document_client.py index 8d6924f36c..027a208932 100644 --- a/src/oci/ai_document/ai_service_document_client.py +++ b/src/oci/ai_document/ai_service_document_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def analyze_document(self, analyze_document_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"analyze_document got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def analyze_document(self, analyze_document_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -263,7 +262,7 @@ def cancel_processor_job(self, processor_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_processor_job got unknown kwargs: {extra_kwargs!r}") @@ -272,10 +271,10 @@ def cancel_processor_job(self, processor_job_id, **kwargs): "processorJobId": processor_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -284,7 +283,7 @@ def cancel_processor_job(self, processor_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -366,7 +365,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -375,10 +374,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -387,7 +386,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -472,7 +471,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -481,10 +480,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -493,7 +492,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -580,7 +579,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -589,10 +588,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -601,7 +600,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -685,7 +684,7 @@ def create_model(self, create_model_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -696,7 +695,7 @@ def create_model(self, create_model_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -783,7 +782,7 @@ def create_processor_job(self, create_processor_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_processor_job got unknown kwargs: {extra_kwargs!r}") @@ -794,7 +793,7 @@ def create_processor_job(self, create_processor_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -881,7 +880,7 @@ def create_project(self, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -892,7 +891,7 @@ def create_project(self, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -979,7 +978,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -988,10 +987,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1000,7 +999,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1082,7 +1081,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -1091,10 +1090,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1103,7 +1102,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1177,7 +1176,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -1186,10 +1185,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1197,7 +1196,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1275,7 +1274,7 @@ def get_processor_job(self, processor_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_processor_job got unknown kwargs: {extra_kwargs!r}") @@ -1284,10 +1283,10 @@ def get_processor_job(self, processor_job_id, **kwargs): "processorJobId": processor_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1295,7 +1294,7 @@ def get_processor_job(self, processor_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1373,7 +1372,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -1382,10 +1381,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1393,7 +1392,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1471,7 +1470,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1480,10 +1479,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1491,7 +1490,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1608,7 +1607,7 @@ def list_models(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -1645,14 +1644,14 @@ def list_models(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1765,7 +1764,7 @@ def list_projects(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -1801,14 +1800,14 @@ def list_projects(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1906,7 +1905,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1915,10 +1914,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1941,14 +1940,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2048,7 +2047,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2057,10 +2056,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2083,14 +2082,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2205,7 +2204,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2241,14 +2240,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2337,7 +2336,7 @@ def patch_model(self, model_id, patch_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_model got unknown kwargs: {extra_kwargs!r}") @@ -2346,10 +2345,10 @@ def patch_model(self, model_id, patch_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2358,7 +2357,7 @@ def patch_model(self, model_id, patch_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2447,7 +2446,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -2456,10 +2455,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2468,7 +2467,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2555,7 +2554,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -2564,10 +2563,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2576,7 +2575,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ai_language/ai_service_language_client.py b/src/oci/ai_language/ai_service_language_client.py index ccc0a2f060..673422e930 100644 --- a/src/oci/ai_language/ai_service_language_client.py +++ b/src/oci/ai_language/ai_service_language_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def batch_detect_dominant_language(self, batch_detect_dominant_language_details, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_dominant_language got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def batch_detect_dominant_language(self, batch_detect_dominant_language_details, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -260,7 +259,7 @@ def batch_detect_health_entity(self, batch_detect_health_entity_details, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_health_entity got unknown kwargs: {extra_kwargs!r}") @@ -270,7 +269,7 @@ def batch_detect_health_entity(self, batch_detect_health_entity_details, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -355,7 +354,7 @@ def batch_detect_language_entities(self, batch_detect_language_entities_details, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_language_entities got unknown kwargs: {extra_kwargs!r}") @@ -365,7 +364,7 @@ def batch_detect_language_entities(self, batch_detect_language_entities_details, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -446,7 +445,7 @@ def batch_detect_language_key_phrases(self, batch_detect_language_key_phrases_de "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_language_key_phrases got unknown kwargs: {extra_kwargs!r}") @@ -456,7 +455,7 @@ def batch_detect_language_key_phrases(self, batch_detect_language_key_phrases_de "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -537,7 +536,7 @@ def batch_detect_language_pii_entities(self, batch_detect_language_pii_entities_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_language_pii_entities got unknown kwargs: {extra_kwargs!r}") @@ -547,7 +546,7 @@ def batch_detect_language_pii_entities(self, batch_detect_language_pii_entities_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -645,7 +644,7 @@ def batch_detect_language_sentiments(self, batch_detect_language_sentiments_deta "opc_request_id", "level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_language_sentiments got unknown kwargs: {extra_kwargs!r}") @@ -661,14 +660,14 @@ def batch_detect_language_sentiments(self, batch_detect_language_sentiments_deta query_params = { "level": self.base_client.generate_collection_format_param(kwargs.get("level", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -757,7 +756,7 @@ def batch_detect_language_text_classification(self, batch_detect_language_text_c "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_detect_language_text_classification got unknown kwargs: {extra_kwargs!r}") @@ -767,7 +766,7 @@ def batch_detect_language_text_classification(self, batch_detect_language_text_c "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -847,7 +846,7 @@ def batch_language_translation(self, batch_language_translation_details, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_language_translation got unknown kwargs: {extra_kwargs!r}") @@ -857,7 +856,7 @@ def batch_language_translation(self, batch_language_translation_details, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -949,7 +948,7 @@ def cancel_job(self, job_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_job got unknown kwargs: {extra_kwargs!r}") @@ -958,10 +957,10 @@ def cancel_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -971,7 +970,7 @@ def cancel_job(self, job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1065,7 +1064,7 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1074,10 +1073,10 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1087,7 +1086,7 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1183,7 +1182,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1192,10 +1191,10 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1205,7 +1204,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1301,7 +1300,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1310,10 +1309,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1323,7 +1322,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1419,7 +1418,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1428,10 +1427,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1441,7 +1440,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1528,7 +1527,7 @@ def create_endpoint(self, create_endpoint_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1539,7 +1538,7 @@ def create_endpoint(self, create_endpoint_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1626,7 +1625,7 @@ def create_job(self, create_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job got unknown kwargs: {extra_kwargs!r}") @@ -1637,7 +1636,7 @@ def create_job(self, create_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1724,7 +1723,7 @@ def create_model(self, create_model_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -1735,7 +1734,7 @@ def create_model(self, create_model_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1822,7 +1821,7 @@ def create_project(self, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -1833,7 +1832,7 @@ def create_project(self, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1920,7 +1919,7 @@ def delete_endpoint(self, endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1929,10 +1928,10 @@ def delete_endpoint(self, endpoint_id, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1941,7 +1940,7 @@ def delete_endpoint(self, endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2025,7 +2024,7 @@ def delete_job(self, job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job got unknown kwargs: {extra_kwargs!r}") @@ -2034,10 +2033,10 @@ def delete_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2046,7 +2045,7 @@ def delete_job(self, job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2130,7 +2129,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -2139,10 +2138,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2151,7 +2150,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2235,7 +2234,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -2244,10 +2243,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2256,7 +2255,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2343,7 +2342,7 @@ def detect_dominant_language(self, detect_dominant_language_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_dominant_language got unknown kwargs: {extra_kwargs!r}") @@ -2353,7 +2352,7 @@ def detect_dominant_language(self, detect_dominant_language_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2448,7 +2447,7 @@ def detect_language_entities(self, detect_language_entities_details, **kwargs): "model_version", "is_pii" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_language_entities got unknown kwargs: {extra_kwargs!r}") @@ -2464,14 +2463,14 @@ def detect_language_entities(self, detect_language_entities_details, **kwargs): "modelVersion": kwargs.get("model_version", missing), "isPii": kwargs.get("is_pii", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2556,7 +2555,7 @@ def detect_language_key_phrases(self, detect_language_key_phrases_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_language_key_phrases got unknown kwargs: {extra_kwargs!r}") @@ -2566,7 +2565,7 @@ def detect_language_key_phrases(self, detect_language_key_phrases_details, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2657,7 +2656,7 @@ def detect_language_sentiments(self, detect_language_sentiments_details, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_language_sentiments got unknown kwargs: {extra_kwargs!r}") @@ -2667,7 +2666,7 @@ def detect_language_sentiments(self, detect_language_sentiments_details, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2754,7 +2753,7 @@ def detect_language_text_classification(self, detect_language_text_classificatio "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_language_text_classification got unknown kwargs: {extra_kwargs!r}") @@ -2764,7 +2763,7 @@ def detect_language_text_classification(self, detect_language_text_classificatio "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2840,7 +2839,7 @@ def get_endpoint(self, endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2849,10 +2848,10 @@ def get_endpoint(self, endpoint_id, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2860,7 +2859,7 @@ def get_endpoint(self, endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2938,7 +2937,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -2947,10 +2946,10 @@ def get_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2958,7 +2957,7 @@ def get_job(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3036,7 +3035,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -3045,10 +3044,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3056,7 +3055,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3134,7 +3133,7 @@ def get_model_type(self, model_type, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model_type got unknown kwargs: {extra_kwargs!r}") @@ -3143,10 +3142,10 @@ def get_model_type(self, model_type, **kwargs): "modelType": model_type } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3154,7 +3153,7 @@ def get_model_type(self, model_type, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3232,7 +3231,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -3241,10 +3240,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3252,7 +3251,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3330,7 +3329,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3339,10 +3338,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3350,7 +3349,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3474,7 +3473,7 @@ def list_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -3512,14 +3511,14 @@ def list_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3605,7 +3604,7 @@ def list_evaluation_results(self, model_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_evaluation_results got unknown kwargs: {extra_kwargs!r}") @@ -3614,24 +3613,24 @@ def list_evaluation_results(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3745,7 +3744,7 @@ def list_jobs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -3781,14 +3780,14 @@ def list_jobs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3908,7 +3907,7 @@ def list_models(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -3945,14 +3944,14 @@ def list_models(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4068,7 +4067,7 @@ def list_projects(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -4104,14 +4103,14 @@ def list_projects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4209,7 +4208,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4218,10 +4217,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4244,14 +4243,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4351,7 +4350,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4360,10 +4359,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4386,14 +4385,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4501,7 +4500,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4529,14 +4528,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4625,7 +4624,7 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4634,10 +4633,10 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4646,7 +4645,7 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4735,7 +4734,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -4744,10 +4743,10 @@ def update_job(self, job_id, update_job_details, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4756,7 +4755,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4847,7 +4846,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -4856,10 +4855,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4868,7 +4867,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4957,7 +4956,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -4966,10 +4965,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4978,7 +4977,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ai_speech/ai_service_speech_client.py b/src/oci/ai_speech/ai_service_speech_client.py index 2d07f3b9dd..9dcad6f7e7 100644 --- a/src/oci/ai_speech/ai_service_speech_client.py +++ b/src/oci/ai_speech/ai_service_speech_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def cancel_transcription_job(self, transcription_job_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_transcription_job got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def cancel_transcription_job(self, transcription_job_id, **kwargs): "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def cancel_transcription_job(self, transcription_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -290,7 +289,7 @@ def cancel_transcription_task(self, transcription_job_id, transcription_task_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_transcription_task got unknown kwargs: {extra_kwargs!r}") @@ -300,10 +299,10 @@ def cancel_transcription_task(self, transcription_job_id, transcription_task_id, "transcriptionTaskId": transcription_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -313,7 +312,7 @@ def cancel_transcription_task(self, transcription_job_id, transcription_task_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -407,7 +406,7 @@ def change_transcription_job_compartment(self, transcription_job_id, change_tran "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_transcription_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -416,10 +415,10 @@ def change_transcription_job_compartment(self, transcription_job_id, change_tran "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -429,7 +428,7 @@ def change_transcription_job_compartment(self, transcription_job_id, change_tran "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -514,7 +513,7 @@ def create_transcription_job(self, create_transcription_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transcription_job got unknown kwargs: {extra_kwargs!r}") @@ -525,7 +524,7 @@ def create_transcription_job(self, create_transcription_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def delete_transcription_job(self, transcription_job_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_transcription_job got unknown kwargs: {extra_kwargs!r}") @@ -627,10 +626,10 @@ def delete_transcription_job(self, transcription_job_id, **kwargs): "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -640,7 +639,7 @@ def delete_transcription_job(self, transcription_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -715,7 +714,7 @@ def get_transcription_job(self, transcription_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transcription_job got unknown kwargs: {extra_kwargs!r}") @@ -724,10 +723,10 @@ def get_transcription_job(self, transcription_job_id, **kwargs): "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -735,7 +734,7 @@ def get_transcription_job(self, transcription_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -814,7 +813,7 @@ def get_transcription_task(self, transcription_job_id, transcription_task_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transcription_task got unknown kwargs: {extra_kwargs!r}") @@ -824,10 +823,10 @@ def get_transcription_task(self, transcription_job_id, transcription_task_id, ** "transcriptionTaskId": transcription_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -835,7 +834,7 @@ def get_transcription_task(self, transcription_job_id, transcription_task_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -946,7 +945,7 @@ def list_transcription_jobs(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transcription_jobs got unknown kwargs: {extra_kwargs!r}") @@ -982,14 +981,14 @@ def list_transcription_jobs(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1099,7 +1098,7 @@ def list_transcription_tasks(self, transcription_job_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transcription_tasks got unknown kwargs: {extra_kwargs!r}") @@ -1108,10 +1107,10 @@ def list_transcription_tasks(self, transcription_job_id, **kwargs): "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -1144,14 +1143,14 @@ def list_transcription_tasks(self, transcription_job_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1240,7 +1239,7 @@ def update_transcription_job(self, transcription_job_id, update_transcription_jo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_transcription_job got unknown kwargs: {extra_kwargs!r}") @@ -1249,10 +1248,10 @@ def update_transcription_job(self, transcription_job_id, update_transcription_jo "transcriptionJobId": transcription_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1261,7 +1260,7 @@ def update_transcription_job(self, transcription_job_id, update_transcription_jo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ai_vision/ai_service_vision_client.py b/src/oci/ai_vision/ai_service_vision_client.py index b7051b6379..7ecb32dd00 100644 --- a/src/oci/ai_vision/ai_service_vision_client.py +++ b/src/oci/ai_vision/ai_service_vision_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -158,7 +157,7 @@ def analyze_document(self, analyze_document_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"analyze_document got unknown kwargs: {extra_kwargs!r}") @@ -168,7 +167,7 @@ def analyze_document(self, analyze_document_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -246,7 +245,7 @@ def analyze_image(self, analyze_image_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"analyze_image got unknown kwargs: {extra_kwargs!r}") @@ -256,7 +255,7 @@ def analyze_image(self, analyze_image_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -342,7 +341,7 @@ def cancel_document_job(self, document_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_document_job got unknown kwargs: {extra_kwargs!r}") @@ -351,10 +350,10 @@ def cancel_document_job(self, document_job_id, **kwargs): "documentJobId": document_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -363,7 +362,7 @@ def cancel_document_job(self, document_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -445,7 +444,7 @@ def cancel_image_job(self, image_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_image_job got unknown kwargs: {extra_kwargs!r}") @@ -454,10 +453,10 @@ def cancel_image_job(self, image_job_id, **kwargs): "imageJobId": image_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -466,7 +465,7 @@ def cancel_image_job(self, image_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -548,7 +547,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -557,10 +556,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -569,7 +568,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -654,7 +653,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -663,10 +662,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -675,7 +674,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -771,10 +770,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -783,7 +782,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -867,7 +866,7 @@ def create_document_job(self, create_document_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_document_job got unknown kwargs: {extra_kwargs!r}") @@ -878,7 +877,7 @@ def create_document_job(self, create_document_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -963,7 +962,7 @@ def create_image_job(self, create_image_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_image_job got unknown kwargs: {extra_kwargs!r}") @@ -974,7 +973,7 @@ def create_image_job(self, create_image_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1059,7 +1058,7 @@ def create_model(self, create_model_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -1070,7 +1069,7 @@ def create_model(self, create_model_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1155,7 +1154,7 @@ def create_project(self, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -1166,7 +1165,7 @@ def create_project(self, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1251,7 +1250,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -1260,10 +1259,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1272,7 +1271,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1354,7 +1353,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -1363,10 +1362,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1375,7 +1374,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1449,7 +1448,7 @@ def get_document_job(self, document_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_document_job got unknown kwargs: {extra_kwargs!r}") @@ -1458,10 +1457,10 @@ def get_document_job(self, document_job_id, **kwargs): "documentJobId": document_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1469,7 +1468,7 @@ def get_document_job(self, document_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1545,7 +1544,7 @@ def get_image_job(self, image_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_image_job got unknown kwargs: {extra_kwargs!r}") @@ -1554,10 +1553,10 @@ def get_image_job(self, image_job_id, **kwargs): "imageJobId": image_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1565,7 +1564,7 @@ def get_image_job(self, image_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1641,7 +1640,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -1650,10 +1649,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1661,7 +1660,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1737,7 +1736,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -1746,10 +1745,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1757,7 +1756,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1833,7 +1832,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1842,10 +1841,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1853,7 +1852,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1968,7 +1967,7 @@ def list_models(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -2005,14 +2004,14 @@ def list_models(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2123,7 +2122,7 @@ def list_projects(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -2159,14 +2158,14 @@ def list_projects(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2262,7 +2261,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2271,10 +2270,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2297,14 +2296,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2402,7 +2401,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2411,10 +2410,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2437,14 +2436,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2557,7 +2556,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2593,14 +2592,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2687,7 +2686,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -2696,10 +2695,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2708,7 +2707,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2795,7 +2794,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -2804,10 +2803,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2816,7 +2815,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/analytics/analytics_client.py b/src/oci/analytics/analytics_client.py index 0e43dc259f..033ca4a98e 100644 --- a/src/oci/analytics/analytics_client.py +++ b/src/oci/analytics/analytics_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_analytics_instance_compartment(self, analytics_instance_id, change_co "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_analytics_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_analytics_instance_compartment(self, analytics_instance_id, change_co "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_analytics_instance_compartment(self, analytics_instance_id, change_co "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -297,7 +296,7 @@ def change_analytics_instance_network_endpoint(self, analytics_instance_id, chan "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_analytics_instance_network_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -306,10 +305,10 @@ def change_analytics_instance_network_endpoint(self, analytics_instance_id, chan "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -319,7 +318,7 @@ def change_analytics_instance_network_endpoint(self, analytics_instance_id, chan "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -408,7 +407,7 @@ def create_analytics_instance(self, create_analytics_instance_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -419,7 +418,7 @@ def create_analytics_instance(self, create_analytics_instance_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -511,7 +510,7 @@ def create_private_access_channel(self, analytics_instance_id, create_private_ac "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_access_channel got unknown kwargs: {extra_kwargs!r}") @@ -520,10 +519,10 @@ def create_private_access_channel(self, analytics_instance_id, create_private_ac "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -532,7 +531,7 @@ def create_private_access_channel(self, analytics_instance_id, create_private_ac "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -624,7 +623,7 @@ def create_vanity_url(self, analytics_instance_id, create_vanity_url_details, ** "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vanity_url got unknown kwargs: {extra_kwargs!r}") @@ -633,10 +632,10 @@ def create_vanity_url(self, analytics_instance_id, create_vanity_url_details, ** "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -645,7 +644,7 @@ def create_vanity_url(self, analytics_instance_id, create_vanity_url_details, ** "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -740,7 +739,7 @@ def delete_analytics_instance(self, analytics_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -749,10 +748,10 @@ def delete_analytics_instance(self, analytics_instance_id, **kwargs): "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -762,7 +761,7 @@ def delete_analytics_instance(self, analytics_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -857,7 +856,7 @@ def delete_private_access_channel(self, private_access_channel_key, analytics_in "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_access_channel got unknown kwargs: {extra_kwargs!r}") @@ -867,10 +866,10 @@ def delete_private_access_channel(self, private_access_channel_key, analytics_in "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -880,7 +879,7 @@ def delete_private_access_channel(self, private_access_channel_key, analytics_in "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -975,7 +974,7 @@ def delete_vanity_url(self, analytics_instance_id, vanity_url_key, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vanity_url got unknown kwargs: {extra_kwargs!r}") @@ -985,10 +984,10 @@ def delete_vanity_url(self, analytics_instance_id, vanity_url_key, **kwargs): "vanityUrlKey": vanity_url_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -998,7 +997,7 @@ def delete_vanity_url(self, analytics_instance_id, vanity_url_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1082,7 +1081,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1091,10 +1090,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1103,7 +1102,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1178,7 +1177,7 @@ def get_analytics_instance(self, analytics_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -1187,10 +1186,10 @@ def get_analytics_instance(self, analytics_instance_id, **kwargs): "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1198,7 +1197,7 @@ def get_analytics_instance(self, analytics_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1280,7 +1279,7 @@ def get_private_access_channel(self, private_access_channel_key, analytics_insta "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_access_channel got unknown kwargs: {extra_kwargs!r}") @@ -1290,10 +1289,10 @@ def get_private_access_channel(self, private_access_channel_key, analytics_insta "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1301,7 +1300,7 @@ def get_private_access_channel(self, private_access_channel_key, analytics_insta "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1380,7 +1379,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1389,10 +1388,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1400,7 +1399,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1535,7 +1534,7 @@ def list_analytics_instances(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_analytics_instances got unknown kwargs: {extra_kwargs!r}") @@ -1586,14 +1585,14 @@ def list_analytics_instances(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1690,7 +1689,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1699,24 +1698,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1815,7 +1814,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1824,24 +1823,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1968,7 +1967,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2012,14 +2011,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2116,7 +2115,7 @@ def scale_analytics_instance(self, analytics_instance_id, scale_analytics_instan "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"scale_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -2125,10 +2124,10 @@ def scale_analytics_instance(self, analytics_instance_id, scale_analytics_instan "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2138,7 +2137,7 @@ def scale_analytics_instance(self, analytics_instance_id, scale_analytics_instan "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2235,7 +2234,7 @@ def set_kms_key(self, analytics_instance_id, set_kms_key_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"set_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -2244,10 +2243,10 @@ def set_kms_key(self, analytics_instance_id, set_kms_key_details, **kwargs): "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2257,7 +2256,7 @@ def set_kms_key(self, analytics_instance_id, set_kms_key_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2352,7 +2351,7 @@ def start_analytics_instance(self, analytics_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -2361,10 +2360,10 @@ def start_analytics_instance(self, analytics_instance_id, **kwargs): "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2374,7 +2373,7 @@ def start_analytics_instance(self, analytics_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2467,7 +2466,7 @@ def stop_analytics_instance(self, analytics_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -2476,10 +2475,10 @@ def stop_analytics_instance(self, analytics_instance_id, **kwargs): "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2489,7 +2488,7 @@ def stop_analytics_instance(self, analytics_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2578,7 +2577,7 @@ def update_analytics_instance(self, analytics_instance_id, update_analytics_inst "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -2587,10 +2586,10 @@ def update_analytics_instance(self, analytics_instance_id, update_analytics_inst "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2599,7 +2598,7 @@ def update_analytics_instance(self, analytics_instance_id, update_analytics_inst "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2698,7 +2697,7 @@ def update_private_access_channel(self, private_access_channel_key, analytics_in "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_access_channel got unknown kwargs: {extra_kwargs!r}") @@ -2708,10 +2707,10 @@ def update_private_access_channel(self, private_access_channel_key, analytics_in "analyticsInstanceId": analytics_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2721,7 +2720,7 @@ def update_private_access_channel(self, private_access_channel_key, analytics_in "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2821,7 +2820,7 @@ def update_vanity_url(self, analytics_instance_id, vanity_url_key, update_vanity "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vanity_url got unknown kwargs: {extra_kwargs!r}") @@ -2831,10 +2830,10 @@ def update_vanity_url(self, analytics_instance_id, vanity_url_key, update_vanity "vanityUrlKey": vanity_url_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2844,7 +2843,7 @@ def update_vanity_url(self, analytics_instance_id, vanity_url_key, update_vanity "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/announcements_service/announcement_client.py b/src/oci/announcements_service/announcement_client.py index 1c2bcc9c44..e08be17388 100644 --- a/src/oci/announcements_service/announcement_client.py +++ b/src/oci/announcements_service/announcement_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -161,7 +160,7 @@ def get_announcement(self, announcement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_announcement got unknown kwargs: {extra_kwargs!r}") @@ -170,10 +169,10 @@ def get_announcement(self, announcement_id, **kwargs): "announcementId": announcement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -181,7 +180,7 @@ def get_announcement(self, announcement_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -260,7 +259,7 @@ def get_announcement_user_status(self, announcement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_announcement_user_status got unknown kwargs: {extra_kwargs!r}") @@ -269,10 +268,10 @@ def get_announcement_user_status(self, announcement_id, **kwargs): "announcementId": announcement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -280,7 +279,7 @@ def get_announcement_user_status(self, announcement_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -427,7 +426,7 @@ def list_announcements(self, compartment_id, **kwargs): "chain_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_announcements got unknown kwargs: {extra_kwargs!r}") @@ -478,14 +477,14 @@ def list_announcements(self, compartment_id, **kwargs): "shouldShowOnlyLatestInChain": kwargs.get("should_show_only_latest_in_chain", missing), "chainId": kwargs.get("chain_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -571,7 +570,7 @@ def update_announcement_user_status(self, announcement_id, status_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_announcement_user_status got unknown kwargs: {extra_kwargs!r}") @@ -580,10 +579,10 @@ def update_announcement_user_status(self, announcement_id, status_details, **kwa "announcementId": announcement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -592,7 +591,7 @@ def update_announcement_user_status(self, announcement_id, status_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/announcements_service/announcement_subscription_client.py b/src/oci/announcements_service/announcement_subscription_client.py index 8a5660778c..095c30a3b3 100644 --- a/src/oci/announcements_service/announcement_subscription_client.py +++ b/src/oci/announcements_service/announcement_subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def change_announcement_subscription_compartment(self, announcement_subscription "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_announcement_subscription_compartment got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def change_announcement_subscription_compartment(self, announcement_subscription "announcementSubscriptionId": announcement_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def change_announcement_subscription_compartment(self, announcement_subscription "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -276,7 +275,7 @@ def create_announcement_subscription(self, create_announcement_subscription_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_announcement_subscription got unknown kwargs: {extra_kwargs!r}") @@ -287,7 +286,7 @@ def create_announcement_subscription(self, create_announcement_subscription_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def create_filter_group(self, announcement_subscription_id, create_filter_group_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_filter_group got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def create_filter_group(self, announcement_subscription_id, create_filter_group_ "announcementSubscriptionId": announcement_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -404,7 +403,7 @@ def create_filter_group(self, announcement_subscription_id, create_filter_group_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -490,7 +489,7 @@ def delete_announcement_subscription(self, announcement_subscription_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_announcement_subscription got unknown kwargs: {extra_kwargs!r}") @@ -499,10 +498,10 @@ def delete_announcement_subscription(self, announcement_subscription_id, **kwarg "announcementSubscriptionId": announcement_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -511,7 +510,7 @@ def delete_announcement_subscription(self, announcement_subscription_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -595,7 +594,7 @@ def delete_filter_group(self, announcement_subscription_id, filter_group_name, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_filter_group got unknown kwargs: {extra_kwargs!r}") @@ -605,10 +604,10 @@ def delete_filter_group(self, announcement_subscription_id, filter_group_name, * "filterGroupName": filter_group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -617,7 +616,7 @@ def delete_filter_group(self, announcement_subscription_id, filter_group_name, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def get_announcement_subscription(self, announcement_subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_announcement_subscription got unknown kwargs: {extra_kwargs!r}") @@ -703,10 +702,10 @@ def get_announcement_subscription(self, announcement_subscription_id, **kwargs): "announcementSubscriptionId": announcement_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -714,7 +713,7 @@ def get_announcement_subscription(self, announcement_subscription_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -827,7 +826,7 @@ def list_announcement_subscriptions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_announcement_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -863,14 +862,14 @@ def list_announcement_subscriptions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -956,7 +955,7 @@ def update_announcement_subscription(self, announcement_subscription_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_announcement_subscription got unknown kwargs: {extra_kwargs!r}") @@ -965,10 +964,10 @@ def update_announcement_subscription(self, announcement_subscription_id, update_ "announcementSubscriptionId": announcement_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -977,7 +976,7 @@ def update_announcement_subscription(self, announcement_subscription_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1068,7 +1067,7 @@ def update_filter_group(self, announcement_subscription_id, filter_group_name, u "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_filter_group got unknown kwargs: {extra_kwargs!r}") @@ -1078,10 +1077,10 @@ def update_filter_group(self, announcement_subscription_id, filter_group_name, u "filterGroupName": filter_group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1090,7 +1089,7 @@ def update_filter_group(self, announcement_subscription_id, filter_group_name, u "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/announcements_service/announcements_preferences_client.py b/src/oci/announcements_service/announcements_preferences_client.py index 3431b1aa04..b84fccb5ea 100644 --- a/src/oci/announcements_service/announcements_preferences_client.py +++ b/src/oci/announcements_service/announcements_preferences_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -165,7 +164,7 @@ def create_announcements_preference(self, announcements_preference_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_announcements_preference got unknown kwargs: {extra_kwargs!r}") @@ -176,7 +175,7 @@ def create_announcements_preference(self, announcements_preference_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -256,7 +255,7 @@ def get_announcements_preference(self, preference_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_announcements_preference got unknown kwargs: {extra_kwargs!r}") @@ -265,10 +264,10 @@ def get_announcements_preference(self, preference_id, **kwargs): "preferenceId": preference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -276,7 +275,7 @@ def get_announcements_preference(self, preference_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -363,7 +362,7 @@ def list_announcements_preferences(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_announcements_preferences got unknown kwargs: {extra_kwargs!r}") @@ -373,14 +372,14 @@ def list_announcements_preferences(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -466,7 +465,7 @@ def update_announcements_preference(self, preference_id, announcements_preferenc "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_announcements_preference got unknown kwargs: {extra_kwargs!r}") @@ -475,10 +474,10 @@ def update_announcements_preference(self, preference_id, announcements_preferenc "preferenceId": preference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -487,7 +486,7 @@ def update_announcements_preference(self, preference_id, announcements_preferenc "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/api_gateway_client.py b/src/oci/apigateway/api_gateway_client.py index 93e7d0b712..7c073b8bc4 100644 --- a/src/oci/apigateway/api_gateway_client.py +++ b/src/oci/apigateway/api_gateway_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_api_compartment(self, api_id, change_api_compartment_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_api_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_api_compartment(self, api_id, change_api_compartment_details, **kwarg "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_api_compartment(self, api_id, change_api_compartment_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -297,7 +296,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_certificate_compartment got unknown kwargs: {extra_kwargs!r}") @@ -306,10 +305,10 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -319,7 +318,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -404,7 +403,7 @@ def create_api(self, create_api_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_api got unknown kwargs: {extra_kwargs!r}") @@ -415,7 +414,7 @@ def create_api(self, create_api_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -502,7 +501,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -513,7 +512,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -600,7 +599,7 @@ def create_sdk(self, create_sdk_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sdk got unknown kwargs: {extra_kwargs!r}") @@ -611,7 +610,7 @@ def create_sdk(self, create_sdk_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -698,7 +697,7 @@ def delete_api(self, api_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_api got unknown kwargs: {extra_kwargs!r}") @@ -707,10 +706,10 @@ def delete_api(self, api_id, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -719,7 +718,7 @@ def delete_api(self, api_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -801,7 +800,7 @@ def delete_certificate(self, certificate_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_certificate got unknown kwargs: {extra_kwargs!r}") @@ -810,10 +809,10 @@ def delete_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -822,7 +821,7 @@ def delete_certificate(self, certificate_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -904,7 +903,7 @@ def delete_sdk(self, sdk_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sdk got unknown kwargs: {extra_kwargs!r}") @@ -913,10 +912,10 @@ def delete_sdk(self, sdk_id, **kwargs): "sdkId": sdk_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -925,7 +924,7 @@ def delete_sdk(self, sdk_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -999,7 +998,7 @@ def get_api(self, api_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_api got unknown kwargs: {extra_kwargs!r}") @@ -1008,10 +1007,10 @@ def get_api(self, api_id, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1019,7 +1018,7 @@ def get_api(self, api_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1113,7 +1112,7 @@ def get_api_content(self, api_id, **kwargs): "if_match", "range" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_api_content got unknown kwargs: {extra_kwargs!r}") @@ -1122,10 +1121,10 @@ def get_api_content(self, api_id, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1135,7 +1134,7 @@ def get_api_content(self, api_id, **kwargs): "if-match": kwargs.get("if_match", missing), "range": kwargs.get("range", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1221,7 +1220,7 @@ def get_api_deployment_specification(self, api_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_api_deployment_specification got unknown kwargs: {extra_kwargs!r}") @@ -1230,10 +1229,10 @@ def get_api_deployment_specification(self, api_id, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1242,7 +1241,7 @@ def get_api_deployment_specification(self, api_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1328,7 +1327,7 @@ def get_api_validations(self, api_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_api_validations got unknown kwargs: {extra_kwargs!r}") @@ -1337,10 +1336,10 @@ def get_api_validations(self, api_id, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1349,7 +1348,7 @@ def get_api_validations(self, api_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1427,7 +1426,7 @@ def get_certificate(self, certificate_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1436,10 +1435,10 @@ def get_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1447,7 +1446,7 @@ def get_certificate(self, certificate_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1525,7 +1524,7 @@ def get_sdk(self, sdk_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sdk got unknown kwargs: {extra_kwargs!r}") @@ -1534,10 +1533,10 @@ def get_sdk(self, sdk_id, **kwargs): "sdkId": sdk_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1545,7 +1544,7 @@ def get_sdk(self, sdk_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1660,7 +1659,7 @@ def list_apis(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_apis got unknown kwargs: {extra_kwargs!r}") @@ -1695,14 +1694,14 @@ def list_apis(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1817,7 +1816,7 @@ def list_certificates(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificates got unknown kwargs: {extra_kwargs!r}") @@ -1852,14 +1851,14 @@ def list_certificates(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1966,7 +1965,7 @@ def list_sdk_language_types(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sdk_language_types got unknown kwargs: {extra_kwargs!r}") @@ -1993,14 +1992,14 @@ def list_sdk_language_types(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2120,7 +2119,7 @@ def list_sdks(self, **kwargs): "api_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sdks got unknown kwargs: {extra_kwargs!r}") @@ -2156,14 +2155,14 @@ def list_sdks(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "apiId": kwargs.get("api_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2252,7 +2251,7 @@ def update_api(self, api_id, update_api_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_api got unknown kwargs: {extra_kwargs!r}") @@ -2261,10 +2260,10 @@ def update_api(self, api_id, update_api_details, **kwargs): "apiId": api_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2273,7 +2272,7 @@ def update_api(self, api_id, update_api_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2360,7 +2359,7 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2369,10 +2368,10 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2381,7 +2380,7 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2468,7 +2467,7 @@ def update_sdk(self, sdk_id, update_sdk_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sdk got unknown kwargs: {extra_kwargs!r}") @@ -2477,10 +2476,10 @@ def update_sdk(self, sdk_id, update_sdk_details, **kwargs): "sdkId": sdk_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2489,7 +2488,7 @@ def update_sdk(self, sdk_id, update_sdk_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/deployment_client.py b/src/oci/apigateway/deployment_client.py index c7874b912a..7b5450f51a 100644 --- a/src/oci/apigateway/deployment_client.py +++ b/src/oci/apigateway/deployment_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deployment got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def delete_deployment(self, deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deployment got unknown kwargs: {extra_kwargs!r}") @@ -393,10 +392,10 @@ def delete_deployment(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def delete_deployment(self, deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def get_deployment(self, deployment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deployment got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def get_deployment(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def get_deployment(self, deployment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def list_deployments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployments got unknown kwargs: {extra_kwargs!r}") @@ -654,14 +653,14 @@ def list_deployments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -750,7 +749,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deployment got unknown kwargs: {extra_kwargs!r}") @@ -759,10 +758,10 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -771,7 +770,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/gateway_client.py b/src/oci/apigateway/gateway_client.py index 74c8b384e7..ac2ad3f17f 100644 --- a/src/oci/apigateway/gateway_client.py +++ b/src/oci/apigateway/gateway_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_gateway_compartment(self, gateway_id, change_gateway_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_gateway_compartment(self, gateway_id, change_gateway_compartment_deta "gatewayId": gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_gateway_compartment(self, gateway_id, change_gateway_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_gateway(self, create_gateway_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_gateway got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_gateway(self, create_gateway_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def delete_gateway(self, gateway_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_gateway got unknown kwargs: {extra_kwargs!r}") @@ -393,10 +392,10 @@ def delete_gateway(self, gateway_id, **kwargs): "gatewayId": gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def delete_gateway(self, gateway_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def get_gateway(self, gateway_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_gateway got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def get_gateway(self, gateway_id, **kwargs): "gatewayId": gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def get_gateway(self, gateway_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def list_gateways(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_gateways got unknown kwargs: {extra_kwargs!r}") @@ -654,14 +653,14 @@ def list_gateways(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -750,7 +749,7 @@ def update_gateway(self, gateway_id, update_gateway_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_gateway got unknown kwargs: {extra_kwargs!r}") @@ -759,10 +758,10 @@ def update_gateway(self, gateway_id, update_gateway_details, **kwargs): "gatewayId": gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -771,7 +770,7 @@ def update_gateway(self, gateway_id, update_gateway_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/subscribers_client.py b/src/oci/apigateway/subscribers_client.py index 6cbb92d14f..953fd792d3 100644 --- a/src/oci/apigateway/subscribers_client.py +++ b/src/oci/apigateway/subscribers_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_subscriber_compartment(self, subscriber_id, change_subscriber_compart "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_subscriber_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_subscriber_compartment(self, subscriber_id, change_subscriber_compart "subscriberId": subscriber_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_subscriber_compartment(self, subscriber_id, change_subscriber_compart "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_subscriber(self, create_subscriber_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_subscriber(self, create_subscriber_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def delete_subscriber(self, subscriber_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -393,10 +392,10 @@ def delete_subscriber(self, subscriber_id, **kwargs): "subscriberId": subscriber_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def delete_subscriber(self, subscriber_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def get_subscriber(self, subscriber_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def get_subscriber(self, subscriber_id, **kwargs): "subscriberId": subscriber_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def get_subscriber(self, subscriber_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -613,7 +612,7 @@ def list_subscribers(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscribers got unknown kwargs: {extra_kwargs!r}") @@ -648,14 +647,14 @@ def list_subscribers(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -744,7 +743,7 @@ def update_subscriber(self, subscriber_id, update_subscriber_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -753,10 +752,10 @@ def update_subscriber(self, subscriber_id, update_subscriber_details, **kwargs): "subscriberId": subscriber_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -765,7 +764,7 @@ def update_subscriber(self, subscriber_id, update_subscriber_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/usage_plans_client.py b/src/oci/apigateway/usage_plans_client.py index e6d70b6b5e..15a8a1a3d2 100644 --- a/src/oci/apigateway/usage_plans_client.py +++ b/src/oci/apigateway/usage_plans_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_usage_plan_compartment(self, usage_plan_id, change_usage_plan_compart "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_usage_plan_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_usage_plan_compartment(self, usage_plan_id, change_usage_plan_compart "usagePlanId": usage_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_usage_plan_compartment(self, usage_plan_id, change_usage_plan_compart "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_usage_plan(self, create_usage_plan_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_usage_plan(self, create_usage_plan_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def delete_usage_plan(self, usage_plan_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -393,10 +392,10 @@ def delete_usage_plan(self, usage_plan_id, **kwargs): "usagePlanId": usage_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def delete_usage_plan(self, usage_plan_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def get_usage_plan(self, usage_plan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def get_usage_plan(self, usage_plan_id, **kwargs): "usagePlanId": usage_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def get_usage_plan(self, usage_plan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -613,7 +612,7 @@ def list_usage_plans(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_usage_plans got unknown kwargs: {extra_kwargs!r}") @@ -648,14 +647,14 @@ def list_usage_plans(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -744,7 +743,7 @@ def update_usage_plan(self, usage_plan_id, update_usage_plan_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -753,10 +752,10 @@ def update_usage_plan(self, usage_plan_id, update_usage_plan_details, **kwargs): "usagePlanId": usage_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -765,7 +764,7 @@ def update_usage_plan(self, usage_plan_id, update_usage_plan_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apigateway/work_requests_client.py b/src/oci/apigateway/work_requests_client.py index f795515b57..593e913240 100644 --- a/src/oci/apigateway/work_requests_client.py +++ b/src/oci/apigateway/work_requests_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -176,7 +175,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -198,7 +197,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -273,7 +272,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -282,10 +281,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -293,7 +292,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -394,7 +393,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -403,10 +402,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -429,14 +428,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -539,7 +538,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -548,10 +547,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -574,14 +573,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -688,7 +687,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -715,14 +714,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_config/config_client.py b/src/oci/apm_config/config_client.py index e5938400dd..3c9a0d6bd0 100644 --- a/src/oci/apm_config/config_client.py +++ b/src/oci/apm_config/config_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -176,7 +175,7 @@ def create_config(self, apm_domain_id, create_config_details, **kwargs): "opc_request_id", "opc_dry_run" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_config got unknown kwargs: {extra_kwargs!r}") @@ -184,7 +183,7 @@ def create_config(self, apm_domain_id, create_config_details, **kwargs): query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -193,7 +192,7 @@ def create_config(self, apm_domain_id, create_config_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-dry-run": kwargs.get("opc_dry_run", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -288,7 +287,7 @@ def delete_config(self, apm_domain_id, config_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_config got unknown kwargs: {extra_kwargs!r}") @@ -297,16 +296,16 @@ def delete_config(self, apm_domain_id, config_id, **kwargs): "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -314,7 +313,7 @@ def delete_config(self, apm_domain_id, config_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -398,7 +397,7 @@ def get_config(self, apm_domain_id, config_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_config got unknown kwargs: {extra_kwargs!r}") @@ -407,23 +406,23 @@ def get_config(self, apm_domain_id, config_id, **kwargs): "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -572,7 +571,7 @@ def list_configs(self, apm_domain_id, **kwargs): "defined_tag_exists", "freeform_tag_exists" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_configs got unknown kwargs: {extra_kwargs!r}") @@ -605,14 +604,14 @@ def list_configs(self, apm_domain_id, **kwargs): "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def retrieve_namespace_metrics(self, apm_domain_id, retrieve_namespace_metrics_d "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_namespace_metrics got unknown kwargs: {extra_kwargs!r}") @@ -702,14 +701,14 @@ def retrieve_namespace_metrics(self, apm_domain_id, retrieve_namespace_metrics_d query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -790,7 +789,7 @@ def retrieve_namespaces(self, apm_domain_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -798,14 +797,14 @@ def retrieve_namespaces(self, apm_domain_id, **kwargs): query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -905,7 +904,7 @@ def update_config(self, apm_domain_id, config_id, update_config_details, **kwarg "opc_request_id", "opc_dry_run" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_config got unknown kwargs: {extra_kwargs!r}") @@ -914,16 +913,16 @@ def update_config(self, apm_domain_id, config_id, update_config_details, **kwarg "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -932,7 +931,7 @@ def update_config(self, apm_domain_id, config_id, update_config_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-dry-run": kwargs.get("opc_dry_run", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1019,7 +1018,7 @@ def validate_span_filter_pattern(self, apm_domain_id, validate_span_filter_patte "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_span_filter_pattern got unknown kwargs: {extra_kwargs!r}") @@ -1027,14 +1026,14 @@ def validate_span_filter_pattern(self, apm_domain_id, validate_span_filter_patte query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_control_plane/apm_domain_client.py b/src/oci/apm_control_plane/apm_domain_client.py index a27657637d..0e328d03fc 100644 --- a/src/oci/apm_control_plane/apm_domain_client.py +++ b/src/oci/apm_control_plane/apm_domain_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_apm_domain_compartment(self, apm_domain_id, change_apm_domain_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_apm_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_apm_domain_compartment(self, apm_domain_id, change_apm_domain_compart "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_apm_domain_compartment(self, apm_domain_id, change_apm_domain_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_apm_domain(self, create_apm_domain_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_apm_domain got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_apm_domain(self, create_apm_domain_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def delete_apm_domain(self, apm_domain_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_apm_domain got unknown kwargs: {extra_kwargs!r}") @@ -392,10 +391,10 @@ def delete_apm_domain(self, apm_domain_id, **kwargs): "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -404,7 +403,7 @@ def delete_apm_domain(self, apm_domain_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -491,7 +490,7 @@ def generate_data_keys(self, generate_data_keys_list_details, apm_domain_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_data_keys got unknown kwargs: {extra_kwargs!r}") @@ -500,10 +499,10 @@ def generate_data_keys(self, generate_data_keys_list_details, apm_domain_id, **k "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -512,7 +511,7 @@ def generate_data_keys(self, generate_data_keys_list_details, apm_domain_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -590,7 +589,7 @@ def get_apm_domain(self, apm_domain_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_apm_domain got unknown kwargs: {extra_kwargs!r}") @@ -599,10 +598,10 @@ def get_apm_domain(self, apm_domain_id, **kwargs): "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -610,7 +609,7 @@ def get_apm_domain(self, apm_domain_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -688,7 +687,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -697,10 +696,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -708,7 +707,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -794,7 +793,7 @@ def list_apm_domain_work_requests(self, apm_domain_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_apm_domain_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -803,24 +802,24 @@ def list_apm_domain_work_requests(self, apm_domain_id, **kwargs): "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -930,7 +929,7 @@ def list_apm_domains(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_apm_domains got unknown kwargs: {extra_kwargs!r}") @@ -965,14 +964,14 @@ def list_apm_domains(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1057,7 +1056,7 @@ def list_data_keys(self, apm_domain_id, **kwargs): "data_key_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_keys got unknown kwargs: {extra_kwargs!r}") @@ -1066,10 +1065,10 @@ def list_data_keys(self, apm_domain_id, **kwargs): "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'data_key_type' in kwargs: @@ -1082,14 +1081,14 @@ def list_data_keys(self, apm_domain_id, **kwargs): query_params = { "dataKeyType": kwargs.get("data_key_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1177,7 +1176,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1186,24 +1185,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1291,7 +1290,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1300,24 +1299,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1405,7 +1404,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1415,14 +1414,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1511,7 +1510,7 @@ def remove_data_keys(self, apm_domain_id, remove_data_keys_list_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_data_keys got unknown kwargs: {extra_kwargs!r}") @@ -1520,10 +1519,10 @@ def remove_data_keys(self, apm_domain_id, remove_data_keys_list_details, **kwarg "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1532,7 +1531,7 @@ def remove_data_keys(self, apm_domain_id, remove_data_keys_list_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1620,7 +1619,7 @@ def update_apm_domain(self, apm_domain_id, update_apm_domain_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_apm_domain got unknown kwargs: {extra_kwargs!r}") @@ -1629,10 +1628,10 @@ def update_apm_domain(self, apm_domain_id, update_apm_domain_details, **kwargs): "apmDomainId": apm_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1641,7 +1640,7 @@ def update_apm_domain(self, apm_domain_id, update_apm_domain_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_synthetics/apm_synthetic_client.py b/src/oci/apm_synthetics/apm_synthetic_client.py index 6f49c3bf2a..bad479ab04 100644 --- a/src/oci/apm_synthetics/apm_synthetic_client.py +++ b/src/oci/apm_synthetics/apm_synthetic_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def aggregate_network_data(self, apm_domain_id, monitor_id, aggregate_network_da "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"aggregate_network_data got unknown kwargs: {extra_kwargs!r}") @@ -182,16 +181,16 @@ def aggregate_network_data(self, apm_domain_id, monitor_id, aggregate_network_da "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -199,7 +198,7 @@ def aggregate_network_data(self, apm_domain_id, monitor_id, aggregate_network_da "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -294,7 +293,7 @@ def create_dedicated_vantage_point(self, apm_domain_id, create_dedicated_vantage "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dedicated_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -302,7 +301,7 @@ def create_dedicated_vantage_point(self, apm_domain_id, create_dedicated_vantage query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -310,7 +309,7 @@ def create_dedicated_vantage_point(self, apm_domain_id, create_dedicated_vantage "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -403,7 +402,7 @@ def create_monitor(self, apm_domain_id, create_monitor_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_monitor got unknown kwargs: {extra_kwargs!r}") @@ -411,7 +410,7 @@ def create_monitor(self, apm_domain_id, create_monitor_details, **kwargs): query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -419,7 +418,7 @@ def create_monitor(self, apm_domain_id, create_monitor_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -512,7 +511,7 @@ def create_on_premise_vantage_point(self, apm_domain_id, create_on_premise_vanta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_on_premise_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -520,7 +519,7 @@ def create_on_premise_vantage_point(self, apm_domain_id, create_on_premise_vanta query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -528,7 +527,7 @@ def create_on_premise_vantage_point(self, apm_domain_id, create_on_premise_vanta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -621,7 +620,7 @@ def create_script(self, apm_domain_id, create_script_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_script got unknown kwargs: {extra_kwargs!r}") @@ -629,7 +628,7 @@ def create_script(self, apm_domain_id, create_script_details, **kwargs): query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -637,7 +636,7 @@ def create_script(self, apm_domain_id, create_script_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -733,7 +732,7 @@ def create_worker(self, apm_domain_id, on_premise_vantage_point_id, create_worke "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_worker got unknown kwargs: {extra_kwargs!r}") @@ -742,16 +741,16 @@ def create_worker(self, apm_domain_id, on_premise_vantage_point_id, create_worke "onPremiseVantagePointId": on_premise_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -759,7 +758,7 @@ def create_worker(self, apm_domain_id, on_premise_vantage_point_id, create_worke "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -854,7 +853,7 @@ def delete_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dedicated_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -863,16 +862,16 @@ def delete_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "dedicatedVantagePointId": dedicated_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -880,7 +879,7 @@ def delete_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -970,7 +969,7 @@ def delete_monitor(self, apm_domain_id, monitor_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_monitor got unknown kwargs: {extra_kwargs!r}") @@ -979,16 +978,16 @@ def delete_monitor(self, apm_domain_id, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -996,7 +995,7 @@ def delete_monitor(self, apm_domain_id, monitor_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1086,7 +1085,7 @@ def delete_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_on_premise_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -1095,16 +1094,16 @@ def delete_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "onPremiseVantagePointId": on_premise_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1112,7 +1111,7 @@ def delete_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1202,7 +1201,7 @@ def delete_script(self, apm_domain_id, script_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_script got unknown kwargs: {extra_kwargs!r}") @@ -1211,16 +1210,16 @@ def delete_script(self, apm_domain_id, script_id, **kwargs): "scriptId": script_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1228,7 +1227,7 @@ def delete_script(self, apm_domain_id, script_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1321,7 +1320,7 @@ def delete_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_worker got unknown kwargs: {extra_kwargs!r}") @@ -1331,16 +1330,16 @@ def delete_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, * "workerId": worker_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1348,7 +1347,7 @@ def delete_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1430,7 +1429,7 @@ def get_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dedicated_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -1439,23 +1438,23 @@ def get_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_id, "dedicatedVantagePointId": dedicated_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1539,7 +1538,7 @@ def get_monitor(self, apm_domain_id, monitor_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitor got unknown kwargs: {extra_kwargs!r}") @@ -1548,23 +1547,23 @@ def get_monitor(self, apm_domain_id, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1660,7 +1659,7 @@ def get_monitor_result(self, apm_domain_id, monitor_id, vantage_point, result_ty "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitor_result got unknown kwargs: {extra_kwargs!r}") @@ -1670,10 +1669,10 @@ def get_monitor_result(self, apm_domain_id, monitor_id, vantage_point, result_ty "executionTime": execution_time } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1682,14 +1681,14 @@ def get_monitor_result(self, apm_domain_id, monitor_id, vantage_point, result_ty "resultType": result_type, "resultContentType": result_content_type } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1773,7 +1772,7 @@ def get_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_point_i "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_on_premise_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -1782,23 +1781,23 @@ def get_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_point_i "onPremiseVantagePointId": on_premise_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1882,7 +1881,7 @@ def get_script(self, apm_domain_id, script_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_script got unknown kwargs: {extra_kwargs!r}") @@ -1891,23 +1890,23 @@ def get_script(self, apm_domain_id, script_id, **kwargs): "scriptId": script_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1994,7 +1993,7 @@ def get_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_worker got unknown kwargs: {extra_kwargs!r}") @@ -2004,23 +2003,23 @@ def get_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, **kw "workerId": worker_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2144,7 +2143,7 @@ def list_dedicated_vantage_points(self, apm_domain_id, **kwargs): "status", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_vantage_points got unknown kwargs: {extra_kwargs!r}") @@ -2180,14 +2179,14 @@ def list_dedicated_vantage_points(self, apm_domain_id, **kwargs): "name": kwargs.get("name", missing), "status": kwargs.get("status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2326,7 +2325,7 @@ def list_monitors(self, apm_domain_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_monitors got unknown kwargs: {extra_kwargs!r}") @@ -2366,14 +2365,14 @@ def list_monitors(self, apm_domain_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2489,7 +2488,7 @@ def list_on_premise_vantage_points(self, apm_domain_id, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_on_premise_vantage_points got unknown kwargs: {extra_kwargs!r}") @@ -2517,14 +2516,14 @@ def list_on_premise_vantage_points(self, apm_domain_id, **kwargs): "displayName": kwargs.get("display_name", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2638,7 +2637,7 @@ def list_public_vantage_points(self, apm_domain_id, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_public_vantage_points got unknown kwargs: {extra_kwargs!r}") @@ -2666,14 +2665,14 @@ def list_public_vantage_points(self, apm_domain_id, **kwargs): "displayName": kwargs.get("display_name", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2789,7 +2788,7 @@ def list_scripts(self, apm_domain_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scripts got unknown kwargs: {extra_kwargs!r}") @@ -2817,14 +2816,14 @@ def list_scripts(self, apm_domain_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2953,7 +2952,7 @@ def list_workers(self, apm_domain_id, on_premise_vantage_point_id, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_workers got unknown kwargs: {extra_kwargs!r}") @@ -2962,10 +2961,10 @@ def list_workers(self, apm_domain_id, on_premise_vantage_point_id, **kwargs): "onPremiseVantagePointId": on_premise_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'status' in kwargs: @@ -3000,14 +2999,14 @@ def list_workers(self, apm_domain_id, on_premise_vantage_point_id, **kwargs): "displayName": kwargs.get("display_name", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3102,7 +3101,7 @@ def update_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dedicated_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -3111,16 +3110,16 @@ def update_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "dedicatedVantagePointId": dedicated_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3128,7 +3127,7 @@ def update_dedicated_vantage_point(self, apm_domain_id, dedicated_vantage_point_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3225,7 +3224,7 @@ def update_monitor(self, apm_domain_id, monitor_id, update_monitor_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_monitor got unknown kwargs: {extra_kwargs!r}") @@ -3234,16 +3233,16 @@ def update_monitor(self, apm_domain_id, monitor_id, update_monitor_details, **kw "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3251,7 +3250,7 @@ def update_monitor(self, apm_domain_id, monitor_id, update_monitor_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3348,7 +3347,7 @@ def update_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_on_premise_vantage_point got unknown kwargs: {extra_kwargs!r}") @@ -3357,16 +3356,16 @@ def update_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "onPremiseVantagePointId": on_premise_vantage_point_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3374,7 +3373,7 @@ def update_on_premise_vantage_point(self, apm_domain_id, on_premise_vantage_poin "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3471,7 +3470,7 @@ def update_script(self, apm_domain_id, script_id, update_script_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_script got unknown kwargs: {extra_kwargs!r}") @@ -3480,16 +3479,16 @@ def update_script(self, apm_domain_id, script_id, update_script_details, **kwarg "scriptId": script_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3497,7 +3496,7 @@ def update_script(self, apm_domain_id, script_id, update_script_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3597,7 +3596,7 @@ def update_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_worker got unknown kwargs: {extra_kwargs!r}") @@ -3607,16 +3606,16 @@ def update_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, u "workerId": worker_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3624,7 +3623,7 @@ def update_worker(self, apm_domain_id, on_premise_vantage_point_id, worker_id, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_traces/attributes_client.py b/src/oci/apm_traces/attributes_client.py index d5371b1e68..c5d58ad71e 100644 --- a/src/oci/apm_traces/attributes_client.py +++ b/src/oci/apm_traces/attributes_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def bulk_activate_attribute(self, apm_domain_id, bulk_activate_attribute_details "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_activate_attribute got unknown kwargs: {extra_kwargs!r}") @@ -176,14 +175,14 @@ def bulk_activate_attribute(self, apm_domain_id, bulk_activate_attribute_details query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -272,7 +271,7 @@ def bulk_de_activate_attribute(self, apm_domain_id, bulk_de_activate_attribute_d "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_de_activate_attribute got unknown kwargs: {extra_kwargs!r}") @@ -280,14 +279,14 @@ def bulk_de_activate_attribute(self, apm_domain_id, bulk_de_activate_attribute_d query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -370,7 +369,7 @@ def bulk_pin_attribute(self, apm_domain_id, bulk_pin_attribute_details, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_pin_attribute got unknown kwargs: {extra_kwargs!r}") @@ -378,14 +377,14 @@ def bulk_pin_attribute(self, apm_domain_id, bulk_pin_attribute_details, **kwargs query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -467,7 +466,7 @@ def bulk_unpin_attribute(self, apm_domain_id, bulk_unpin_attribute_details, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_unpin_attribute got unknown kwargs: {extra_kwargs!r}") @@ -475,14 +474,14 @@ def bulk_unpin_attribute(self, apm_domain_id, bulk_unpin_attribute_details, **kw query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def bulk_update_attribute(self, apm_domain_id, bulk_update_attribute_details, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_update_attribute got unknown kwargs: {extra_kwargs!r}") @@ -572,14 +571,14 @@ def bulk_update_attribute(self, apm_domain_id, bulk_update_attribute_details, ** query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -663,7 +662,7 @@ def bulk_update_attribute_notes(self, apm_domain_id, bulk_update_attribute_notes "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_update_attribute_notes got unknown kwargs: {extra_kwargs!r}") @@ -671,14 +670,14 @@ def bulk_update_attribute_notes(self, apm_domain_id, bulk_update_attribute_notes query_params = { "apmDomainId": apm_domain_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def get_status_auto_activate(self, apm_domain_id, data_key_type, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_status_auto_activate got unknown kwargs: {extra_kwargs!r}") @@ -777,14 +776,14 @@ def get_status_auto_activate(self, apm_domain_id, data_key_type, **kwargs): "apmDomainId": apm_domain_id, "dataKeyType": data_key_type } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -869,7 +868,7 @@ def put_toggle_auto_activate(self, apm_domain_id, is_auto_activate_on, data_key_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_toggle_auto_activate got unknown kwargs: {extra_kwargs!r}") @@ -885,14 +884,14 @@ def put_toggle_auto_activate(self, apm_domain_id, is_auto_activate_on, data_key_ "isAutoActivateOn": is_auto_activate_on, "dataKeyType": data_key_type } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_traces/query_client.py b/src/oci/apm_traces/query_client.py index 0144f44dbc..07dcd795b1 100644 --- a/src/oci/apm_traces/query_client.py +++ b/src/oci/apm_traces/query_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def list_quick_picks(self, apm_domain_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_quick_picks got unknown kwargs: {extra_kwargs!r}") @@ -179,14 +178,14 @@ def list_quick_picks(self, apm_domain_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -285,7 +284,7 @@ def query(self, apm_domain_id, time_span_started_greater_than_or_equal_to, time_ "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"query got unknown kwargs: {extra_kwargs!r}") @@ -297,14 +296,14 @@ def query(self, apm_domain_id, time_span_started_greater_than_or_equal_to, time_ "timeSpanStartedGreaterThanOrEqualTo": time_span_started_greater_than_or_equal_to, "timeSpanStartedLessThan": time_span_started_less_than } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/apm_traces/trace_client.py b/src/oci/apm_traces/trace_client.py index 5a9e75c6e8..3b7d1aefbb 100644 --- a/src/oci/apm_traces/trace_client.py +++ b/src/oci/apm_traces/trace_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def get_aggregated_snapshot(self, apm_domain_id, trace_key, **kwargs): "span_key", "span_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_aggregated_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def get_aggregated_snapshot(self, apm_domain_id, trace_key, **kwargs): "traceKey": trace_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -200,14 +199,14 @@ def get_aggregated_snapshot(self, apm_domain_id, trace_key, **kwargs): "spanKey": kwargs.get("span_key", missing), "spanName": kwargs.get("span_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -306,7 +305,7 @@ def get_span(self, apm_domain_id, span_key, trace_key, **kwargs): "time_span_started_less_than", "span_namespace" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_span got unknown kwargs: {extra_kwargs!r}") @@ -316,10 +315,10 @@ def get_span(self, apm_domain_id, span_key, trace_key, **kwargs): "traceKey": trace_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'span_namespace' in kwargs: @@ -335,14 +334,14 @@ def get_span(self, apm_domain_id, span_key, trace_key, **kwargs): "timeSpanStartedLessThan": kwargs.get("time_span_started_less_than", missing), "spanNamespace": kwargs.get("span_namespace", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -438,7 +437,7 @@ def get_trace(self, apm_domain_id, trace_key, **kwargs): "time_trace_started_less_than", "trace_namespace" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_trace got unknown kwargs: {extra_kwargs!r}") @@ -447,10 +446,10 @@ def get_trace(self, apm_domain_id, trace_key, **kwargs): "traceKey": trace_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'trace_namespace' in kwargs: @@ -466,14 +465,14 @@ def get_trace(self, apm_domain_id, trace_key, **kwargs): "timeTraceStartedLessThan": kwargs.get("time_trace_started_less_than", missing), "traceNamespace": kwargs.get("trace_namespace", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -567,7 +566,7 @@ def get_trace_snapshot(self, apm_domain_id, trace_key, **kwargs): "thread_id", "snapshot_time" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_trace_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -576,10 +575,10 @@ def get_trace_snapshot(self, apm_domain_id, trace_key, **kwargs): "traceKey": trace_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -588,14 +587,14 @@ def get_trace_snapshot(self, apm_domain_id, trace_key, **kwargs): "threadId": kwargs.get("thread_id", missing), "snapshotTime": kwargs.get("snapshot_time", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/application_migration/application_migration_client.py b/src/oci/application_migration/application_migration_client.py index 2db78afd0f..5136516309 100644 --- a/src/oci/application_migration/application_migration_client.py +++ b/src/oci/application_migration/application_migration_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -291,7 +290,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_migration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -300,10 +299,10 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -313,7 +312,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -413,7 +412,7 @@ def change_source_compartment(self, source_id, change_source_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -422,10 +421,10 @@ def change_source_compartment(self, source_id, change_source_compartment_details "sourceId": source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -435,7 +434,7 @@ def change_source_compartment(self, source_id, change_source_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -543,7 +542,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_migration got unknown kwargs: {extra_kwargs!r}") @@ -554,7 +553,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -658,7 +657,7 @@ def create_source(self, create_source_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_source got unknown kwargs: {extra_kwargs!r}") @@ -669,7 +668,7 @@ def create_source(self, create_source_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -759,7 +758,7 @@ def delete_migration(self, migration_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_migration got unknown kwargs: {extra_kwargs!r}") @@ -768,10 +767,10 @@ def delete_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -780,7 +779,7 @@ def delete_migration(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -867,7 +866,7 @@ def delete_source(self, source_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_source got unknown kwargs: {extra_kwargs!r}") @@ -876,10 +875,10 @@ def delete_source(self, source_id, **kwargs): "sourceId": source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -888,7 +887,7 @@ def delete_source(self, source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -965,7 +964,7 @@ def get_migration(self, migration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_migration got unknown kwargs: {extra_kwargs!r}") @@ -974,10 +973,10 @@ def get_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -985,7 +984,7 @@ def get_migration(self, migration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1064,7 +1063,7 @@ def get_source(self, source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_source got unknown kwargs: {extra_kwargs!r}") @@ -1073,10 +1072,10 @@ def get_source(self, source_id, **kwargs): "sourceId": source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1084,7 +1083,7 @@ def get_source(self, source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1163,7 +1162,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1172,10 +1171,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1183,7 +1182,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1306,7 +1305,7 @@ def list_migrations(self, compartment_id, **kwargs): "display_name", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migrations got unknown kwargs: {extra_kwargs!r}") @@ -1342,14 +1341,14 @@ def list_migrations(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1467,7 +1466,7 @@ def list_source_applications(self, source_id, compartment_id, **kwargs): "sort_by", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_applications got unknown kwargs: {extra_kwargs!r}") @@ -1476,10 +1475,10 @@ def list_source_applications(self, source_id, compartment_id, **kwargs): "sourceId": source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1504,14 +1503,14 @@ def list_source_applications(self, source_id, compartment_id, **kwargs): "compartmentId": compartment_id, "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1639,7 +1638,7 @@ def list_sources(self, compartment_id, **kwargs): "display_name", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sources got unknown kwargs: {extra_kwargs!r}") @@ -1675,14 +1674,14 @@ def list_sources(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1781,7 +1780,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1790,10 +1789,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1808,14 +1807,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1916,7 +1915,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1925,10 +1924,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1943,14 +1942,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2051,7 +2050,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2062,14 +2061,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2172,7 +2171,7 @@ def migrate_application(self, migration_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"migrate_application got unknown kwargs: {extra_kwargs!r}") @@ -2181,10 +2180,10 @@ def migrate_application(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2194,7 +2193,7 @@ def migrate_application(self, migration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2319,7 +2318,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_migration got unknown kwargs: {extra_kwargs!r}") @@ -2328,10 +2327,10 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2341,7 +2340,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2433,7 +2432,7 @@ def update_source(self, source_id, update_source_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_source got unknown kwargs: {extra_kwargs!r}") @@ -2442,10 +2441,10 @@ def update_source(self, source_id, update_source_details, **kwargs): "sourceId": source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2454,7 +2453,7 @@ def update_source(self, source_id, update_source_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/appmgmt_control/appmgmt_control_client.py b/src/oci/appmgmt_control/appmgmt_control_client.py index 9e612c66a3..56f5dc0553 100644 --- a/src/oci/appmgmt_control/appmgmt_control_client.py +++ b/src/oci/appmgmt_control/appmgmt_control_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def activate_monitoring_plugin(self, monitored_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_monitoring_plugin got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def activate_monitoring_plugin(self, monitored_instance_id, **kwargs): "monitoredInstanceId": monitored_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def activate_monitoring_plugin(self, monitored_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -263,7 +262,7 @@ def get_monitored_instance(self, monitored_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitored_instance got unknown kwargs: {extra_kwargs!r}") @@ -272,10 +271,10 @@ def get_monitored_instance(self, monitored_instance_id, **kwargs): "monitoredInstanceId": monitored_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -283,7 +282,7 @@ def get_monitored_instance(self, monitored_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -361,7 +360,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -370,10 +369,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -381,7 +380,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -483,7 +482,7 @@ def list_monitored_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_monitored_instances got unknown kwargs: {extra_kwargs!r}") @@ -510,14 +509,14 @@ def list_monitored_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -603,7 +602,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -612,24 +611,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -717,7 +716,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -726,24 +725,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -835,7 +834,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -846,14 +845,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -939,7 +938,7 @@ def publish_top_processes_metrics(self, monitored_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_top_processes_metrics got unknown kwargs: {extra_kwargs!r}") @@ -948,10 +947,10 @@ def publish_top_processes_metrics(self, monitored_instance_id, **kwargs): "monitoredInstanceId": monitored_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -960,7 +959,7 @@ def publish_top_processes_metrics(self, monitored_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/artifacts/artifacts_client.py b/src/oci/artifacts/artifacts_client.py index c363eadf54..44f9e71baf 100644 --- a/src/oci/artifacts/artifacts_client.py +++ b/src/oci/artifacts/artifacts_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -185,7 +184,7 @@ def change_container_repository_compartment(self, repository_id, change_containe "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_container_repository_compartment got unknown kwargs: {extra_kwargs!r}") @@ -194,10 +193,10 @@ def change_container_repository_compartment(self, repository_id, change_containe "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -207,7 +206,7 @@ def change_container_repository_compartment(self, repository_id, change_containe "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -312,7 +311,7 @@ def change_repository_compartment(self, repository_id, change_repository_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_repository_compartment got unknown kwargs: {extra_kwargs!r}") @@ -321,10 +320,10 @@ def change_repository_compartment(self, repository_id, change_repository_compart "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -334,7 +333,7 @@ def change_repository_compartment(self, repository_id, change_repository_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -428,7 +427,7 @@ def create_container_image_signature(self, create_container_image_signature_deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_container_image_signature got unknown kwargs: {extra_kwargs!r}") @@ -440,7 +439,7 @@ def create_container_image_signature(self, create_container_image_signature_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -528,7 +527,7 @@ def create_container_repository(self, create_container_repository_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_container_repository got unknown kwargs: {extra_kwargs!r}") @@ -539,7 +538,7 @@ def create_container_repository(self, create_container_repository_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -627,7 +626,7 @@ def create_repository(self, create_repository_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_repository got unknown kwargs: {extra_kwargs!r}") @@ -638,7 +637,7 @@ def create_repository(self, create_repository_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -726,7 +725,7 @@ def delete_container_image(self, image_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_image got unknown kwargs: {extra_kwargs!r}") @@ -735,10 +734,10 @@ def delete_container_image(self, image_id, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -747,7 +746,7 @@ def delete_container_image(self, image_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -834,7 +833,7 @@ def delete_container_image_signature(self, image_signature_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_image_signature got unknown kwargs: {extra_kwargs!r}") @@ -843,10 +842,10 @@ def delete_container_image_signature(self, image_signature_id, **kwargs): "imageSignatureId": image_signature_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -855,7 +854,7 @@ def delete_container_image_signature(self, image_signature_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -942,7 +941,7 @@ def delete_container_repository(self, repository_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_repository got unknown kwargs: {extra_kwargs!r}") @@ -951,10 +950,10 @@ def delete_container_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -963,7 +962,7 @@ def delete_container_repository(self, repository_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1052,7 +1051,7 @@ def delete_generic_artifact(self, artifact_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_generic_artifact got unknown kwargs: {extra_kwargs!r}") @@ -1061,10 +1060,10 @@ def delete_generic_artifact(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1073,7 +1072,7 @@ def delete_generic_artifact(self, artifact_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1170,7 +1169,7 @@ def delete_generic_artifact_by_path(self, repository_id, artifact_path, version, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_generic_artifact_by_path got unknown kwargs: {extra_kwargs!r}") @@ -1181,10 +1180,10 @@ def delete_generic_artifact_by_path(self, repository_id, artifact_path, version, "version": version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1193,7 +1192,7 @@ def delete_generic_artifact_by_path(self, repository_id, artifact_path, version, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1280,7 +1279,7 @@ def delete_repository(self, repository_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_repository got unknown kwargs: {extra_kwargs!r}") @@ -1289,10 +1288,10 @@ def delete_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1301,7 +1300,7 @@ def delete_repository(self, repository_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1380,7 +1379,7 @@ def get_container_configuration(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1388,14 +1387,14 @@ def get_container_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1478,7 +1477,7 @@ def get_container_image(self, image_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_image got unknown kwargs: {extra_kwargs!r}") @@ -1487,10 +1486,10 @@ def get_container_image(self, image_id, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1498,7 +1497,7 @@ def get_container_image(self, image_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1581,7 +1580,7 @@ def get_container_image_signature(self, image_signature_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_image_signature got unknown kwargs: {extra_kwargs!r}") @@ -1590,10 +1589,10 @@ def get_container_image_signature(self, image_signature_id, **kwargs): "imageSignatureId": image_signature_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1601,7 +1600,7 @@ def get_container_image_signature(self, image_signature_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1684,7 +1683,7 @@ def get_container_repository(self, repository_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_repository got unknown kwargs: {extra_kwargs!r}") @@ -1693,10 +1692,10 @@ def get_container_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1704,7 +1703,7 @@ def get_container_repository(self, repository_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1789,7 +1788,7 @@ def get_generic_artifact(self, artifact_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_generic_artifact got unknown kwargs: {extra_kwargs!r}") @@ -1798,10 +1797,10 @@ def get_generic_artifact(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1809,7 +1808,7 @@ def get_generic_artifact(self, artifact_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1902,7 +1901,7 @@ def get_generic_artifact_by_path(self, repository_id, artifact_path, version, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_generic_artifact_by_path got unknown kwargs: {extra_kwargs!r}") @@ -1913,10 +1912,10 @@ def get_generic_artifact_by_path(self, repository_id, artifact_path, version, ** "version": version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1924,7 +1923,7 @@ def get_generic_artifact_by_path(self, repository_id, artifact_path, version, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2007,7 +2006,7 @@ def get_repository(self, repository_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repository got unknown kwargs: {extra_kwargs!r}") @@ -2016,10 +2015,10 @@ def get_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2027,7 +2026,7 @@ def get_repository(self, repository_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2200,7 +2199,7 @@ def list_container_image_signatures(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_image_signatures got unknown kwargs: {extra_kwargs!r}") @@ -2242,14 +2241,14 @@ def list_container_image_signatures(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2408,7 +2407,7 @@ def list_container_images(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_images got unknown kwargs: {extra_kwargs!r}") @@ -2442,14 +2441,14 @@ def list_container_images(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2592,7 +2591,7 @@ def list_container_repositories(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_repositories got unknown kwargs: {extra_kwargs!r}") @@ -2623,14 +2622,14 @@ def list_container_repositories(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2776,7 +2775,7 @@ def list_generic_artifacts(self, compartment_id, repository_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_generic_artifacts got unknown kwargs: {extra_kwargs!r}") @@ -2809,14 +2808,14 @@ def list_generic_artifacts(self, compartment_id, repository_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2951,7 +2950,7 @@ def list_repositories(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_repositories got unknown kwargs: {extra_kwargs!r}") @@ -2981,14 +2980,14 @@ def list_repositories(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3088,7 +3087,7 @@ def remove_container_version(self, image_id, remove_container_version_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_container_version got unknown kwargs: {extra_kwargs!r}") @@ -3097,10 +3096,10 @@ def remove_container_version(self, image_id, remove_container_version_details, * "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3110,7 +3109,7 @@ def remove_container_version(self, image_id, remove_container_version_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3213,7 +3212,7 @@ def restore_container_image(self, image_id, restore_container_image_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_container_image got unknown kwargs: {extra_kwargs!r}") @@ -3222,10 +3221,10 @@ def restore_container_image(self, image_id, restore_container_image_details, **k "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3235,7 +3234,7 @@ def restore_container_image(self, image_id, restore_container_image_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3328,7 +3327,7 @@ def update_container_configuration(self, compartment_id, update_container_config "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3336,7 +3335,7 @@ def update_container_configuration(self, compartment_id, update_container_config query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3344,7 +3343,7 @@ def update_container_configuration(self, compartment_id, update_container_config "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3438,7 +3437,7 @@ def update_container_image(self, image_id, update_container_image_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_image got unknown kwargs: {extra_kwargs!r}") @@ -3447,10 +3446,10 @@ def update_container_image(self, image_id, update_container_image_details, **kwa "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3459,7 +3458,7 @@ def update_container_image(self, image_id, update_container_image_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3553,7 +3552,7 @@ def update_container_image_signature(self, image_signature_id, update_container_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_image_signature got unknown kwargs: {extra_kwargs!r}") @@ -3562,10 +3561,10 @@ def update_container_image_signature(self, image_signature_id, update_container_ "imageSignatureId": image_signature_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3574,7 +3573,7 @@ def update_container_image_signature(self, image_signature_id, update_container_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3668,7 +3667,7 @@ def update_container_repository(self, repository_id, update_container_repository "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_repository got unknown kwargs: {extra_kwargs!r}") @@ -3677,10 +3676,10 @@ def update_container_repository(self, repository_id, update_container_repository "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3689,7 +3688,7 @@ def update_container_repository(self, repository_id, update_container_repository "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3787,7 +3786,7 @@ def update_generic_artifact(self, artifact_id, update_generic_artifact_details, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_generic_artifact got unknown kwargs: {extra_kwargs!r}") @@ -3796,10 +3795,10 @@ def update_generic_artifact(self, artifact_id, update_generic_artifact_details, "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3808,7 +3807,7 @@ def update_generic_artifact(self, artifact_id, update_generic_artifact_details, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3912,7 +3911,7 @@ def update_generic_artifact_by_path(self, repository_id, artifact_path, version, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_generic_artifact_by_path got unknown kwargs: {extra_kwargs!r}") @@ -3923,10 +3922,10 @@ def update_generic_artifact_by_path(self, repository_id, artifact_path, version, "version": version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3935,7 +3934,7 @@ def update_generic_artifact_by_path(self, repository_id, artifact_path, version, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4029,7 +4028,7 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_repository got unknown kwargs: {extra_kwargs!r}") @@ -4038,10 +4037,10 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4050,7 +4049,7 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/audit/audit_client.py b/src/oci/audit/audit_client.py index fd496853f6..2e5eb2de93 100644 --- a/src/oci/audit/audit_client.py +++ b/src/oci/audit/audit_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -153,7 +152,7 @@ def get_configuration(self, compartment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/audit/20190901/Configuration/GetConfiguration" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration got unknown kwargs: {extra_kwargs!r}") @@ -161,7 +160,7 @@ def get_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -276,7 +275,7 @@ def list_events(self, compartment_id, start_time, end_time, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_events got unknown kwargs: {extra_kwargs!r}") @@ -287,14 +286,14 @@ def list_events(self, compartment_id, start_time, end_time, **kwargs): "endTime": end_time, "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -365,7 +364,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k api_reference_link = "https://docs.oracle.com/iaas/api/#/en/audit/20190901/Configuration/UpdateConfiguration" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration got unknown kwargs: {extra_kwargs!r}") @@ -373,7 +372,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", diff --git a/src/oci/auth/auth_utils.py b/src/oci/auth/auth_utils.py index fca105fdcc..6107129e82 100644 --- a/src/oci/auth/auth_utils.py +++ b/src/oci/auth/auth_utils.py @@ -3,7 +3,6 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. import random -from oci._vendor import six def get_tenancy_id_from_certificate(cert): @@ -21,10 +20,7 @@ def get_tenancy_id_from_certificate(cert): def sanitize_certificate_string(cert_string): - if six.PY3: - string_to_replace = cert_string.decode('ascii') - else: - string_to_replace = cert_string + string_to_replace = cert_string.decode('ascii') return string_to_replace \ .replace('-----BEGIN CERTIFICATE-----', '') \ diff --git a/src/oci/auth/certificate_retriever.py b/src/oci/auth/certificate_retriever.py index c38b58e471..6139559a34 100644 --- a/src/oci/auth/certificate_retriever.py +++ b/src/oci/auth/certificate_retriever.py @@ -10,7 +10,6 @@ import oci.retry import os.path -from oci._vendor import six import threading import logging import pprint @@ -119,7 +118,7 @@ def __init__(self, **kwargs): else: self.logger.disabled = True - if self.passphrase and isinstance(self.passphrase, six.text_type): + if self.passphrase and isinstance(self.passphrase, str): self.passphrase = self.passphrase.encode('ascii') self._refresh_lock = threading.Lock() @@ -207,7 +206,7 @@ def _refresh_inner(self): """ import oci.signer - downloaded_certificate = six.BytesIO() + downloaded_certificate = io.BytesIO() self.logger.debug("Requesting certificate from : %s " % (self.cert_url)) response = self.requests_session.get(self.cert_url, stream=True, timeout=(10, 60)) self.logger.debug("Receiving certificate response......\n{}\n".format(pprint.pformat( @@ -224,13 +223,13 @@ def _refresh_inner(self): self.certificate_and_private_key['certificate'] = downloaded_certificate.getvalue().strip() downloaded_certificate.close() - if isinstance(self.certificate_and_private_key['certificate'], six.text_type): + if isinstance(self.certificate_and_private_key['certificate'], str): self.certificate_and_private_key['certificate'] = self.certificate_and_private_key['certificate'].encode('ascii') self._check_valid_certificate_string(self.certificate_and_private_key['certificate']) if self.private_key_url: - downloaded_private_key_raw = six.BytesIO() + downloaded_private_key_raw = io.BytesIO() self.logger.debug("Requesting private key from : %s " % (self.private_key_url)) response = self.requests_session.get(self.private_key_url, stream=True, timeout=(10, 60)) @@ -249,7 +248,7 @@ def _refresh_inner(self): self.certificate_and_private_key['private_key_pem'] = downloaded_private_key_raw.getvalue().strip() downloaded_private_key_raw.close() - if isinstance(self.certificate_and_private_key['private_key_pem'], six.text_type): + if isinstance(self.certificate_and_private_key['private_key_pem'], str): self.certificate_and_private_key['private_key_pem'] = self.certificate_and_private_key['private_key_pem'].encode('ascii') try: @@ -306,13 +305,13 @@ def __init__(self, **kwargs): if 'certificate_pem' not in kwargs: raise TypeError('certificate_pem must be supplied as a keyword argument') - if isinstance(kwargs['certificate_pem'], six.text_type): + if isinstance(kwargs['certificate_pem'], str): self.certificate_and_private_key['certificate'] = kwargs['certificate_pem'].encode('ascii') else: self.certificate_and_private_key['certificate'] = kwargs['certificate_pem'] if 'private_key_pem' in kwargs and kwargs['private_key_pem']: - if isinstance(kwargs['private_key_pem'], six.text_type): + if isinstance(kwargs['private_key_pem'], str): self.certificate_and_private_key['private_key_pem'] = kwargs['private_key_pem'].encode('ascii') else: self.certificate_and_private_key['private_key_pem'] = kwargs['private_key_pem'] diff --git a/src/oci/autoscaling/auto_scaling_client.py b/src/oci/autoscaling/auto_scaling_client.py index 40af410165..07751dddec 100644 --- a/src/oci/autoscaling/auto_scaling_client.py +++ b/src/oci/autoscaling/auto_scaling_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def change_auto_scaling_configuration_compartment(self, auto_scaling_configurati "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_auto_scaling_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -197,10 +196,10 @@ def change_auto_scaling_configuration_compartment(self, auto_scaling_configurati "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -210,7 +209,7 @@ def change_auto_scaling_configuration_compartment(self, auto_scaling_configurati "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -294,7 +293,7 @@ def create_auto_scaling_configuration(self, create_auto_scaling_configuration_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -305,7 +304,7 @@ def create_auto_scaling_configuration(self, create_auto_scaling_configuration_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -402,7 +401,7 @@ def create_auto_scaling_policy(self, auto_scaling_configuration_id, create_auto_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_auto_scaling_policy got unknown kwargs: {extra_kwargs!r}") @@ -411,10 +410,10 @@ def create_auto_scaling_policy(self, auto_scaling_configuration_id, create_auto_ "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -423,7 +422,7 @@ def create_auto_scaling_policy(self, auto_scaling_configuration_id, create_auto_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -509,7 +508,7 @@ def delete_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -518,10 +517,10 @@ def delete_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwa "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def delete_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -614,7 +613,7 @@ def delete_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_auto_scaling_policy got unknown kwargs: {extra_kwargs!r}") @@ -624,10 +623,10 @@ def delete_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "autoScalingPolicyId": auto_scaling_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -636,7 +635,7 @@ def delete_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -711,7 +710,7 @@ def get_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -720,10 +719,10 @@ def get_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwargs "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -731,7 +730,7 @@ def get_auto_scaling_configuration(self, auto_scaling_configuration_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -811,7 +810,7 @@ def get_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling_po "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_auto_scaling_policy got unknown kwargs: {extra_kwargs!r}") @@ -821,10 +820,10 @@ def get_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling_po "autoScalingPolicyId": auto_scaling_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -832,7 +831,7 @@ def get_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling_po "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -944,7 +943,7 @@ def list_auto_scaling_configurations(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auto_scaling_configurations got unknown kwargs: {extra_kwargs!r}") @@ -971,14 +970,14 @@ def list_auto_scaling_configurations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1088,7 +1087,7 @@ def list_auto_scaling_policies(self, auto_scaling_configuration_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auto_scaling_policies got unknown kwargs: {extra_kwargs!r}") @@ -1097,10 +1096,10 @@ def list_auto_scaling_policies(self, auto_scaling_configuration_id, **kwargs): "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1124,14 +1123,14 @@ def list_auto_scaling_policies(self, auto_scaling_configuration_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1228,7 +1227,7 @@ def update_auto_scaling_configuration(self, auto_scaling_configuration_id, updat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1237,10 +1236,10 @@ def update_auto_scaling_configuration(self, auto_scaling_configuration_id, updat "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1250,7 +1249,7 @@ def update_auto_scaling_configuration(self, auto_scaling_configuration_id, updat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1350,7 +1349,7 @@ def update_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_auto_scaling_policy got unknown kwargs: {extra_kwargs!r}") @@ -1360,10 +1359,10 @@ def update_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "autoScalingPolicyId": auto_scaling_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1373,7 +1372,7 @@ def update_auto_scaling_policy(self, auto_scaling_configuration_id, auto_scaling "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/base_client.py b/src/oci/base_client.py index 5aaa0c6bfa..1358f77280 100644 --- a/src/oci/base_client.py +++ b/src/oci/base_client.py @@ -6,6 +6,7 @@ import json import logging import platform +import urllib import circuitbreaker import pytz @@ -20,12 +21,12 @@ import _strptime # noqa: F401 from datetime import date, datetime, timezone from timeit import default_timer as timer -from ._vendor import requests, six, urllib3, sseclient +from ._vendor import requests, urllib3, sseclient from dateutil.parser import parse from dateutil import tz import functools -from six.moves.http_client import HTTPResponse +from http.client import HTTPResponse from . import constants, exceptions, regions, retry from .auth import signers @@ -49,7 +50,7 @@ # Expect header is enabled by default enable_expect_header = True expect_header_env_var = os.environ.get('OCI_PYSDK_USING_EXPECT_HEADER', True) -if isinstance(expect_header_env_var, six.string_types) and expect_header_env_var.lower() == "false": +if isinstance(expect_header_env_var, str) and expect_header_env_var.lower() == "false": enable_expect_header = False @@ -80,17 +81,17 @@ def utc_now(): def is_http_log_enabled(is_enabled): if is_enabled: - six.moves.http_client.HTTPConnection.debuglevel = 1 + http.client.HTTPConnection.debuglevel = 1 else: - six.moves.http_client.HTTPConnection.debuglevel = 0 + http.client.HTTPConnection.debuglevel = 0 def _sanitize_headers_for_requests(headers): # Requests does not accept int or float values headers # Convert int, float and bool to string # Bools are automatically handled with this as bool is a subclass of int - for header_name, header_value in six.iteritems(headers): - if isinstance(header_value, six.integer_types) or isinstance(header_value, float): + for header_name, header_value in headers.items(): + if isinstance(header_value, int) or isinstance(header_value, float): headers[header_name] = str(header_value) return headers @@ -128,7 +129,7 @@ def _read_all_headers(fp): def _to_bytes(input_buffer): bytes_buffer = [] for chunk in input_buffer: - if isinstance(chunk, six.text_type): + if isinstance(chunk, str): bytes_buffer.append(chunk.encode('utf-8')) else: bytes_buffer.append(chunk) @@ -257,7 +258,7 @@ class BaseClient(object): primitive_type_map = { 'int': int, 'float': float, - 'str': six.u, + 'str': str, 'bool': bool, 'date': date, 'datetime': datetime, @@ -494,7 +495,7 @@ def call_api(self, resource_path, method, if path_params: path_params = self.sanitize_for_serialization(path_params) for k, v in path_params.items(): - replacement = six.moves.urllib.parse.quote(str(self.to_path_value(v))) + replacement = urllib.parse.quote(str(self.to_path_value(v))) resource_path = resource_path.\ replace('{' + k + '}', replacement) @@ -789,13 +790,13 @@ def sanitize_for_serialization(self, obj, declared_type=None, field_name=None): :param obj: The data to serialize. :return: The serialized form of data. """ - types = (six.string_types, six.integer_types, float, bool, type(None)) + types = (str, int, float, bool, type(None)) declared_swagger_type_to_acceptable_python_types = { - 'str': six.string_types, + 'str': str, 'bool': bool, - 'int': (float, six.integer_types), - 'float': (float, six.integer_types) + 'int': (float, int), + 'float': (float, int) } # if there is a declared type for this obj, then validate that obj is of that type. None types (either None or the NONE_SENTINEL) are not validated but @@ -848,10 +849,10 @@ def sanitize_for_serialization(self, obj, declared_type=None, field_name=None): for attr, _ in obj.swagger_types.items() if getattr(obj, attr) is not None} - keys_to_types_and_field_name = {obj.attribute_map[attr]: (swagger_type, attr) for attr, swagger_type in six.iteritems(obj.swagger_types)} + keys_to_types_and_field_name = {obj.attribute_map[attr]: (swagger_type, attr) for attr, swagger_type in obj.swagger_types.items()} sanitized_dict = {} - for key, val in six.iteritems(obj_dict): + for key, val in obj_dict.items(): value_declared_type = None inner_field_name = key if keys_to_types_and_field_name: @@ -953,7 +954,7 @@ def deserialize_response_data(self, response_data, response_type, allow_control_ # Taking the inverse result because strict=True means we do not allow control characters. json_response = json.loads(response_data, strict=not should_allow_control_chars) # Load everything as JSON and then verify that the object returned - # is a string (six.text_type) if the response type is a string. + # is a string (str) if the response type is a string. # This is matches the previous behavior, which happens to strip # the embedded quotes in the get_namespace response. # There is the potential that an API will declare that it returns @@ -961,7 +962,7 @@ def deserialize_response_data(self, response_data, response_type, allow_control_ # we do not update the response_data with the json_response. # If we do later steps will fail because they are expecting the # response_data to be a string. - if response_type != "str" or type(json_response) == six.text_type: + if response_type != "str" or type(json_response) == str: response_data = json_response except ValueError: pass @@ -1008,7 +1009,7 @@ def __deserialize(self, data, cls): cls = cls.get_subtype(data) # get_subtype returns a str cls = self.type_mappings[cls] - if cls in [int, float, six.u, bool]: + if cls in [int, float, str, bool]: return self.__deserialize_primitive(data, cls) elif cls == object: return data @@ -1031,7 +1032,7 @@ def __deserialize_primitive(self, data, cls): try: value = cls(data) except UnicodeEncodeError: - value = six.u(data) + value = str(data) except TypeError: value = data return value diff --git a/src/oci/bastion/bastion_client.py b/src/oci/bastion/bastion_client.py index dc5bb9e9cd..c5a88d9a48 100644 --- a/src/oci/bastion/bastion_client.py +++ b/src/oci/bastion/bastion_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def change_bastion_compartment(self, bastion_id, change_bastion_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_bastion_compartment got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def change_bastion_compartment(self, bastion_id, change_bastion_compartment_deta "bastionId": bastion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def change_bastion_compartment(self, bastion_id, change_bastion_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -274,7 +273,7 @@ def create_bastion(self, create_bastion_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_bastion got unknown kwargs: {extra_kwargs!r}") @@ -285,7 +284,7 @@ def create_bastion(self, create_bastion_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -370,7 +369,7 @@ def create_session(self, create_session_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_session got unknown kwargs: {extra_kwargs!r}") @@ -381,7 +380,7 @@ def create_session(self, create_session_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -466,7 +465,7 @@ def delete_bastion(self, bastion_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_bastion got unknown kwargs: {extra_kwargs!r}") @@ -475,10 +474,10 @@ def delete_bastion(self, bastion_id, **kwargs): "bastionId": bastion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -487,7 +486,7 @@ def delete_bastion(self, bastion_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -569,7 +568,7 @@ def delete_session(self, session_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_session got unknown kwargs: {extra_kwargs!r}") @@ -578,10 +577,10 @@ def delete_session(self, session_id, **kwargs): "sessionId": session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -590,7 +589,7 @@ def delete_session(self, session_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -664,7 +663,7 @@ def get_bastion(self, bastion_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bastion got unknown kwargs: {extra_kwargs!r}") @@ -673,10 +672,10 @@ def get_bastion(self, bastion_id, **kwargs): "bastionId": bastion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -684,7 +683,7 @@ def get_bastion(self, bastion_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def get_session(self, session_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_session got unknown kwargs: {extra_kwargs!r}") @@ -771,10 +770,10 @@ def get_session(self, session_id, **kwargs): "sessionId": session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -782,7 +781,7 @@ def get_session(self, session_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -860,7 +859,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -869,10 +868,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -880,7 +879,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -990,7 +989,7 @@ def list_bastions(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bastions got unknown kwargs: {extra_kwargs!r}") @@ -1026,14 +1025,14 @@ def list_bastions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1143,7 +1142,7 @@ def list_sessions(self, bastion_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sessions got unknown kwargs: {extra_kwargs!r}") @@ -1179,14 +1178,14 @@ def list_sessions(self, bastion_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1270,7 +1269,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1279,24 +1278,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1382,7 +1381,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1391,24 +1390,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1494,7 +1493,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1504,14 +1503,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1598,7 +1597,7 @@ def update_bastion(self, bastion_id, update_bastion_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_bastion got unknown kwargs: {extra_kwargs!r}") @@ -1607,10 +1606,10 @@ def update_bastion(self, bastion_id, update_bastion_details, **kwargs): "bastionId": bastion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1619,7 +1618,7 @@ def update_bastion(self, bastion_id, update_bastion_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1708,7 +1707,7 @@ def update_session(self, session_id, update_session_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_session got unknown kwargs: {extra_kwargs!r}") @@ -1717,10 +1716,10 @@ def update_session(self, session_id, update_session_details, **kwargs): "sessionId": session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1729,7 +1728,7 @@ def update_session(self, session_id, update_session_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/bds/bds_client.py b/src/oci/bds/bds_client.py index 5e89035a7d..351750c799 100644 --- a/src/oci/bds/bds_client.py +++ b/src/oci/bds/bds_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def activate_bds_metastore_configuration(self, bds_instance_id, metastore_config "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def activate_bds_metastore_configuration(self, bds_instance_id, metastore_config "metastoreConfigId": metastore_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def activate_bds_metastore_configuration(self, bds_instance_id, metastore_config "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def add_auto_scaling_configuration(self, bds_instance_id, add_auto_scaling_confi "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def add_auto_scaling_configuration(self, bds_instance_id, add_auto_scaling_confi "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -321,7 +320,7 @@ def add_auto_scaling_configuration(self, bds_instance_id, add_auto_scaling_confi "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -417,7 +416,7 @@ def add_block_storage(self, bds_instance_id, add_block_storage_details, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_block_storage got unknown kwargs: {extra_kwargs!r}") @@ -426,10 +425,10 @@ def add_block_storage(self, bds_instance_id, add_block_storage_details, **kwargs "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -439,7 +438,7 @@ def add_block_storage(self, bds_instance_id, add_block_storage_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -535,7 +534,7 @@ def add_cloud_sql(self, bds_instance_id, add_cloud_sql_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_cloud_sql got unknown kwargs: {extra_kwargs!r}") @@ -544,10 +543,10 @@ def add_cloud_sql(self, bds_instance_id, add_cloud_sql_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -557,7 +556,7 @@ def add_cloud_sql(self, bds_instance_id, add_cloud_sql_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -653,7 +652,7 @@ def add_kafka(self, bds_instance_id, add_kafka_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_kafka got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def add_kafka(self, bds_instance_id, add_kafka_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -675,7 +674,7 @@ def add_kafka(self, bds_instance_id, add_kafka_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -771,7 +770,7 @@ def add_master_nodes(self, bds_instance_id, add_master_nodes_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_master_nodes got unknown kwargs: {extra_kwargs!r}") @@ -780,10 +779,10 @@ def add_master_nodes(self, bds_instance_id, add_master_nodes_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -793,7 +792,7 @@ def add_master_nodes(self, bds_instance_id, add_master_nodes_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -889,7 +888,7 @@ def add_utility_nodes(self, bds_instance_id, add_utility_nodes_details, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_utility_nodes got unknown kwargs: {extra_kwargs!r}") @@ -898,10 +897,10 @@ def add_utility_nodes(self, bds_instance_id, add_utility_nodes_details, **kwargs "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -911,7 +910,7 @@ def add_utility_nodes(self, bds_instance_id, add_utility_nodes_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1007,7 +1006,7 @@ def add_worker_nodes(self, bds_instance_id, add_worker_nodes_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_worker_nodes got unknown kwargs: {extra_kwargs!r}") @@ -1016,10 +1015,10 @@ def add_worker_nodes(self, bds_instance_id, add_worker_nodes_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1029,7 +1028,7 @@ def add_worker_nodes(self, bds_instance_id, add_worker_nodes_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1125,7 +1124,7 @@ def certificate_service_info(self, bds_instance_id, certificate_service_info_det "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"certificate_service_info got unknown kwargs: {extra_kwargs!r}") @@ -1134,10 +1133,10 @@ def certificate_service_info(self, bds_instance_id, certificate_service_info_det "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1147,7 +1146,7 @@ def certificate_service_info(self, bds_instance_id, certificate_service_info_det "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1245,7 +1244,7 @@ def change_bds_instance_compartment(self, bds_instance_id, change_bds_instance_c "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_bds_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1254,10 +1253,10 @@ def change_bds_instance_compartment(self, bds_instance_id, change_bds_instance_c "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1267,7 +1266,7 @@ def change_bds_instance_compartment(self, bds_instance_id, change_bds_instance_c "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1363,7 +1362,7 @@ def change_shape(self, bds_instance_id, change_shape_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_shape got unknown kwargs: {extra_kwargs!r}") @@ -1372,10 +1371,10 @@ def change_shape(self, bds_instance_id, change_shape_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1385,7 +1384,7 @@ def change_shape(self, bds_instance_id, change_shape_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1473,7 +1472,7 @@ def create_bds_api_key(self, bds_instance_id, create_bds_api_key_details, **kwar "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_bds_api_key got unknown kwargs: {extra_kwargs!r}") @@ -1482,10 +1481,10 @@ def create_bds_api_key(self, bds_instance_id, create_bds_api_key_details, **kwar "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1494,7 +1493,7 @@ def create_bds_api_key(self, bds_instance_id, create_bds_api_key_details, **kwar "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1579,7 +1578,7 @@ def create_bds_instance(self, create_bds_instance_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -1590,7 +1589,7 @@ def create_bds_instance(self, create_bds_instance_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1676,7 +1675,7 @@ def create_bds_metastore_configuration(self, bds_instance_id, create_bds_metasto "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1685,10 +1684,10 @@ def create_bds_metastore_configuration(self, bds_instance_id, create_bds_metasto "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1697,7 +1696,7 @@ def create_bds_metastore_configuration(self, bds_instance_id, create_bds_metasto "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1785,7 +1784,7 @@ def delete_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_bds_api_key got unknown kwargs: {extra_kwargs!r}") @@ -1795,10 +1794,10 @@ def delete_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1807,7 +1806,7 @@ def delete_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1889,7 +1888,7 @@ def delete_bds_instance(self, bds_instance_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -1898,10 +1897,10 @@ def delete_bds_instance(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1910,7 +1909,7 @@ def delete_bds_instance(self, bds_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1995,7 +1994,7 @@ def delete_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2005,10 +2004,10 @@ def delete_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "metastoreConfigId": metastore_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2017,7 +2016,7 @@ def delete_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2110,7 +2109,7 @@ def disable_certificate(self, bds_instance_id, disable_certificate_details, **kw "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2119,10 +2118,10 @@ def disable_certificate(self, bds_instance_id, disable_certificate_details, **kw "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2132,7 +2131,7 @@ def disable_certificate(self, bds_instance_id, disable_certificate_details, **kw "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2228,7 +2227,7 @@ def enable_certificate(self, bds_instance_id, enable_certificate_details, **kwar "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2237,10 +2236,10 @@ def enable_certificate(self, bds_instance_id, enable_certificate_details, **kwar "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2250,7 +2249,7 @@ def enable_certificate(self, bds_instance_id, enable_certificate_details, **kwar "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2346,7 +2345,7 @@ def execute_bootstrap_script(self, bds_instance_id, execute_bootstrap_script_det "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"execute_bootstrap_script got unknown kwargs: {extra_kwargs!r}") @@ -2355,10 +2354,10 @@ def execute_bootstrap_script(self, bds_instance_id, execute_bootstrap_script_det "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2368,7 +2367,7 @@ def execute_bootstrap_script(self, bds_instance_id, execute_bootstrap_script_det "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2448,7 +2447,7 @@ def get_auto_scaling_configuration(self, bds_instance_id, auto_scaling_configura "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2458,10 +2457,10 @@ def get_auto_scaling_configuration(self, bds_instance_id, auto_scaling_configura "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2469,7 +2468,7 @@ def get_auto_scaling_configuration(self, bds_instance_id, auto_scaling_configura "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2548,7 +2547,7 @@ def get_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bds_api_key got unknown kwargs: {extra_kwargs!r}") @@ -2558,10 +2557,10 @@ def get_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2569,7 +2568,7 @@ def get_bds_api_key(self, bds_instance_id, api_key_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2645,7 +2644,7 @@ def get_bds_instance(self, bds_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -2654,10 +2653,10 @@ def get_bds_instance(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2665,7 +2664,7 @@ def get_bds_instance(self, bds_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2744,7 +2743,7 @@ def get_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2754,10 +2753,10 @@ def get_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "metastoreConfigId": metastore_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2765,7 +2764,7 @@ def get_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2860,7 +2859,7 @@ def get_os_patch_details(self, bds_instance_id, os_patch_version, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_os_patch_details got unknown kwargs: {extra_kwargs!r}") @@ -2869,16 +2868,16 @@ def get_os_patch_details(self, bds_instance_id, os_patch_version, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "osPatchVersion": os_patch_version } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2887,7 +2886,7 @@ def get_os_patch_details(self, bds_instance_id, os_patch_version, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2966,7 +2965,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2975,10 +2974,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2986,7 +2985,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3081,7 +3080,7 @@ def install_os_patch(self, bds_instance_id, install_os_patch_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_os_patch got unknown kwargs: {extra_kwargs!r}") @@ -3090,10 +3089,10 @@ def install_os_patch(self, bds_instance_id, install_os_patch_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3103,7 +3102,7 @@ def install_os_patch(self, bds_instance_id, install_os_patch_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3199,7 +3198,7 @@ def install_patch(self, bds_instance_id, install_patch_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_patch got unknown kwargs: {extra_kwargs!r}") @@ -3208,10 +3207,10 @@ def install_patch(self, bds_instance_id, install_patch_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3221,7 +3220,7 @@ def install_patch(self, bds_instance_id, install_patch_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3331,7 +3330,7 @@ def list_auto_scaling_configurations(self, compartment_id, bds_instance_id, **kw "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auto_scaling_configurations got unknown kwargs: {extra_kwargs!r}") @@ -3340,10 +3339,10 @@ def list_auto_scaling_configurations(self, compartment_id, bds_instance_id, **kw "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3376,14 +3375,14 @@ def list_auto_scaling_configurations(self, compartment_id, bds_instance_id, **kw "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3495,7 +3494,7 @@ def list_bds_api_keys(self, bds_instance_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bds_api_keys got unknown kwargs: {extra_kwargs!r}") @@ -3504,10 +3503,10 @@ def list_bds_api_keys(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -3540,14 +3539,14 @@ def list_bds_api_keys(self, bds_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3655,7 +3654,7 @@ def list_bds_instances(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bds_instances got unknown kwargs: {extra_kwargs!r}") @@ -3690,14 +3689,14 @@ def list_bds_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3817,7 +3816,7 @@ def list_bds_metastore_configurations(self, bds_instance_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bds_metastore_configurations got unknown kwargs: {extra_kwargs!r}") @@ -3826,10 +3825,10 @@ def list_bds_metastore_configurations(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'metastore_type' in kwargs: @@ -3871,14 +3870,14 @@ def list_bds_metastore_configurations(self, bds_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3992,7 +3991,7 @@ def list_os_patches(self, bds_instance_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_os_patches got unknown kwargs: {extra_kwargs!r}") @@ -4001,10 +4000,10 @@ def list_os_patches(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4027,7 +4026,7 @@ def list_os_patches(self, bds_instance_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4036,7 +4035,7 @@ def list_os_patches(self, bds_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4151,7 +4150,7 @@ def list_patch_histories(self, bds_instance_id, **kwargs): "limit", "patch_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_patch_histories got unknown kwargs: {extra_kwargs!r}") @@ -4160,10 +4159,10 @@ def list_patch_histories(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -4203,14 +4202,14 @@ def list_patch_histories(self, bds_instance_id, **kwargs): "limit": kwargs.get("limit", missing), "patchType": kwargs.get("patch_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4296,7 +4295,7 @@ def list_patches(self, bds_instance_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_patches got unknown kwargs: {extra_kwargs!r}") @@ -4305,24 +4304,24 @@ def list_patches(self, bds_instance_id, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4420,7 +4419,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4429,10 +4428,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4455,14 +4454,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4560,7 +4559,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4569,10 +4568,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4595,14 +4594,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4704,7 +4703,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4731,14 +4730,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4836,7 +4835,7 @@ def remove_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -4846,10 +4845,10 @@ def remove_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4859,7 +4858,7 @@ def remove_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4955,7 +4954,7 @@ def remove_cloud_sql(self, bds_instance_id, remove_cloud_sql_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_cloud_sql got unknown kwargs: {extra_kwargs!r}") @@ -4964,10 +4963,10 @@ def remove_cloud_sql(self, bds_instance_id, remove_cloud_sql_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4977,7 +4976,7 @@ def remove_cloud_sql(self, bds_instance_id, remove_cloud_sql_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5073,7 +5072,7 @@ def remove_kafka(self, bds_instance_id, remove_kafka_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_kafka got unknown kwargs: {extra_kwargs!r}") @@ -5082,10 +5081,10 @@ def remove_kafka(self, bds_instance_id, remove_kafka_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5095,7 +5094,7 @@ def remove_kafka(self, bds_instance_id, remove_kafka_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5183,7 +5182,7 @@ def remove_node(self, bds_instance_id, remove_node_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_node got unknown kwargs: {extra_kwargs!r}") @@ -5192,10 +5191,10 @@ def remove_node(self, bds_instance_id, remove_node_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5204,7 +5203,7 @@ def remove_node(self, bds_instance_id, remove_node_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5299,7 +5298,7 @@ def renew_certificate(self, bds_instance_id, renew_certificate_details, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"renew_certificate got unknown kwargs: {extra_kwargs!r}") @@ -5308,10 +5307,10 @@ def renew_certificate(self, bds_instance_id, renew_certificate_details, **kwargs "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5321,7 +5320,7 @@ def renew_certificate(self, bds_instance_id, renew_certificate_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5417,7 +5416,7 @@ def restart_node(self, bds_instance_id, restart_node_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_node got unknown kwargs: {extra_kwargs!r}") @@ -5426,10 +5425,10 @@ def restart_node(self, bds_instance_id, restart_node_details, **kwargs): "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5439,7 +5438,7 @@ def restart_node(self, bds_instance_id, restart_node_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5527,7 +5526,7 @@ def start_bds_instance(self, bds_instance_id, start_bds_instance_details, **kwar "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -5536,10 +5535,10 @@ def start_bds_instance(self, bds_instance_id, start_bds_instance_details, **kwar "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5548,7 +5547,7 @@ def start_bds_instance(self, bds_instance_id, start_bds_instance_details, **kwar "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5635,7 +5634,7 @@ def stop_bds_instance(self, bds_instance_id, stop_bds_instance_details, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -5644,10 +5643,10 @@ def stop_bds_instance(self, bds_instance_id, stop_bds_instance_details, **kwargs "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5656,7 +5655,7 @@ def stop_bds_instance(self, bds_instance_id, stop_bds_instance_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5746,7 +5745,7 @@ def test_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -5756,10 +5755,10 @@ def test_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "metastoreConfigId": metastore_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5768,7 +5767,7 @@ def test_bds_metastore_configuration(self, bds_instance_id, metastore_config_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5850,7 +5849,7 @@ def test_bds_object_storage_connection(self, bds_instance_id, api_key_id, test_b "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_bds_object_storage_connection got unknown kwargs: {extra_kwargs!r}") @@ -5860,10 +5859,10 @@ def test_bds_object_storage_connection(self, bds_instance_id, api_key_id, test_b "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5871,7 +5870,7 @@ def test_bds_object_storage_connection(self, bds_instance_id, api_key_id, test_b "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5969,7 +5968,7 @@ def update_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_auto_scaling_configuration got unknown kwargs: {extra_kwargs!r}") @@ -5979,10 +5978,10 @@ def update_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "autoScalingConfigurationId": auto_scaling_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5992,7 +5991,7 @@ def update_auto_scaling_configuration(self, bds_instance_id, auto_scaling_config "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6080,7 +6079,7 @@ def update_bds_instance(self, bds_instance_id, update_bds_instance_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_bds_instance got unknown kwargs: {extra_kwargs!r}") @@ -6089,10 +6088,10 @@ def update_bds_instance(self, bds_instance_id, update_bds_instance_details, **kw "bdsInstanceId": bds_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6101,7 +6100,7 @@ def update_bds_instance(self, bds_instance_id, update_bds_instance_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6191,7 +6190,7 @@ def update_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_bds_metastore_configuration got unknown kwargs: {extra_kwargs!r}") @@ -6201,10 +6200,10 @@ def update_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "metastoreConfigId": metastore_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6213,7 +6212,7 @@ def update_bds_metastore_configuration(self, bds_instance_id, metastore_config_i "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/blockchain/blockchain_platform_client.py b/src/oci/blockchain/blockchain_platform_client.py index 4e0b35b3d5..d3dd4a6757 100644 --- a/src/oci/blockchain/blockchain_platform_client.py +++ b/src/oci/blockchain/blockchain_platform_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_blockchain_platform_compartment(self, blockchain_platform_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_blockchain_platform_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_blockchain_platform_compartment(self, blockchain_platform_id, change_ "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_blockchain_platform_compartment(self, blockchain_platform_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def create_blockchain_platform(self, create_blockchain_platform_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -295,7 +294,7 @@ def create_blockchain_platform(self, create_blockchain_platform_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -389,7 +388,7 @@ def create_osn(self, blockchain_platform_id, create_osn_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_osn got unknown kwargs: {extra_kwargs!r}") @@ -398,10 +397,10 @@ def create_osn(self, blockchain_platform_id, create_osn_details, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -411,7 +410,7 @@ def create_osn(self, blockchain_platform_id, create_osn_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -499,7 +498,7 @@ def create_peer(self, blockchain_platform_id, create_peer_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_peer got unknown kwargs: {extra_kwargs!r}") @@ -508,10 +507,10 @@ def create_peer(self, blockchain_platform_id, create_peer_details, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -520,7 +519,7 @@ def create_peer(self, blockchain_platform_id, create_peer_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -613,7 +612,7 @@ def delete_blockchain_platform(self, blockchain_platform_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -622,10 +621,10 @@ def delete_blockchain_platform(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -635,7 +634,7 @@ def delete_blockchain_platform(self, blockchain_platform_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -721,7 +720,7 @@ def delete_osn(self, blockchain_platform_id, osn_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_osn got unknown kwargs: {extra_kwargs!r}") @@ -731,10 +730,10 @@ def delete_osn(self, blockchain_platform_id, osn_id, **kwargs): "osnId": osn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -743,7 +742,7 @@ def delete_osn(self, blockchain_platform_id, osn_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -836,7 +835,7 @@ def delete_peer(self, blockchain_platform_id, peer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_peer got unknown kwargs: {extra_kwargs!r}") @@ -846,10 +845,10 @@ def delete_peer(self, blockchain_platform_id, peer_id, **kwargs): "peerId": peer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -859,7 +858,7 @@ def delete_peer(self, blockchain_platform_id, peer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -942,7 +941,7 @@ def delete_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -951,10 +950,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -963,7 +962,7 @@ def delete_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1037,7 +1036,7 @@ def get_blockchain_platform(self, blockchain_platform_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -1046,10 +1045,10 @@ def get_blockchain_platform(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1057,7 +1056,7 @@ def get_blockchain_platform(self, blockchain_platform_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1136,7 +1135,7 @@ def get_osn(self, blockchain_platform_id, osn_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_osn got unknown kwargs: {extra_kwargs!r}") @@ -1146,10 +1145,10 @@ def get_osn(self, blockchain_platform_id, osn_id, **kwargs): "osnId": osn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1157,7 +1156,7 @@ def get_osn(self, blockchain_platform_id, osn_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1236,7 +1235,7 @@ def get_peer(self, blockchain_platform_id, peer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_peer got unknown kwargs: {extra_kwargs!r}") @@ -1246,10 +1245,10 @@ def get_peer(self, blockchain_platform_id, peer_id, **kwargs): "peerId": peer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1257,7 +1256,7 @@ def get_peer(self, blockchain_platform_id, peer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1333,7 +1332,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1342,10 +1341,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1353,7 +1352,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1437,7 +1436,7 @@ def list_blockchain_platform_patches(self, blockchain_platform_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_blockchain_platform_patches got unknown kwargs: {extra_kwargs!r}") @@ -1446,24 +1445,24 @@ def list_blockchain_platform_patches(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1573,7 +1572,7 @@ def list_blockchain_platforms(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_blockchain_platforms got unknown kwargs: {extra_kwargs!r}") @@ -1608,14 +1607,14 @@ def list_blockchain_platforms(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1724,7 +1723,7 @@ def list_osns(self, blockchain_platform_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_osns got unknown kwargs: {extra_kwargs!r}") @@ -1733,10 +1732,10 @@ def list_osns(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1760,7 +1759,7 @@ def list_osns(self, blockchain_platform_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1768,7 +1767,7 @@ def list_osns(self, blockchain_platform_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1880,7 +1879,7 @@ def list_peers(self, blockchain_platform_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_peers got unknown kwargs: {extra_kwargs!r}") @@ -1889,10 +1888,10 @@ def list_peers(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1916,7 +1915,7 @@ def list_peers(self, blockchain_platform_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1924,7 +1923,7 @@ def list_peers(self, blockchain_platform_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2011,7 +2010,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2020,24 +2019,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2123,7 +2122,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2132,24 +2131,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2250,7 +2249,7 @@ def list_work_requests(self, compartment_id, blockchain_platform_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2277,14 +2276,14 @@ def list_work_requests(self, compartment_id, blockchain_platform_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2363,7 +2362,7 @@ def preview_scale_blockchain_platform(self, blockchain_platform_id, scale_blockc "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"preview_scale_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -2372,10 +2371,10 @@ def preview_scale_blockchain_platform(self, blockchain_platform_id, scale_blockc "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2383,7 +2382,7 @@ def preview_scale_blockchain_platform(self, blockchain_platform_id, scale_blockc "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2480,7 +2479,7 @@ def scale_blockchain_platform(self, blockchain_platform_id, scale_blockchain_pla "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"scale_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -2489,10 +2488,10 @@ def scale_blockchain_platform(self, blockchain_platform_id, scale_blockchain_pla "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2502,7 +2501,7 @@ def scale_blockchain_platform(self, blockchain_platform_id, scale_blockchain_pla "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2595,7 +2594,7 @@ def start_blockchain_platform(self, blockchain_platform_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -2604,10 +2603,10 @@ def start_blockchain_platform(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2617,7 +2616,7 @@ def start_blockchain_platform(self, blockchain_platform_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2708,7 +2707,7 @@ def stop_blockchain_platform(self, blockchain_platform_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -2717,10 +2716,10 @@ def stop_blockchain_platform(self, blockchain_platform_id, **kwargs): "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2730,7 +2729,7 @@ def stop_blockchain_platform(self, blockchain_platform_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2824,7 +2823,7 @@ def update_blockchain_platform(self, update_blockchain_platform_details, blockch "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -2833,10 +2832,10 @@ def update_blockchain_platform(self, update_blockchain_platform_details, blockch "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2846,7 +2845,7 @@ def update_blockchain_platform(self, update_blockchain_platform_details, blockch "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2945,7 +2944,7 @@ def update_osn(self, blockchain_platform_id, osn_id, update_osn_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_osn got unknown kwargs: {extra_kwargs!r}") @@ -2955,10 +2954,10 @@ def update_osn(self, blockchain_platform_id, osn_id, update_osn_details, **kwarg "osnId": osn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2968,7 +2967,7 @@ def update_osn(self, blockchain_platform_id, osn_id, update_osn_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3067,7 +3066,7 @@ def update_peer(self, blockchain_platform_id, peer_id, update_peer_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_peer got unknown kwargs: {extra_kwargs!r}") @@ -3077,10 +3076,10 @@ def update_peer(self, blockchain_platform_id, peer_id, update_peer_details, **kw "peerId": peer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3090,7 +3089,7 @@ def update_peer(self, blockchain_platform_id, peer_id, update_peer_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3186,7 +3185,7 @@ def upgrade_blockchain_platform(self, upgrade_blockchain_platform_details, block "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_blockchain_platform got unknown kwargs: {extra_kwargs!r}") @@ -3195,10 +3194,10 @@ def upgrade_blockchain_platform(self, upgrade_blockchain_platform_details, block "blockchainPlatformId": blockchain_platform_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3208,7 +3207,7 @@ def upgrade_blockchain_platform(self, upgrade_blockchain_platform_details, block "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/budget/budget_client.py b/src/oci/budget/budget_client.py index 3ea1027cbb..39977d0d68 100644 --- a/src/oci/budget/budget_client.py +++ b/src/oci/budget/budget_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def create_alert_rule(self, budget_id, create_alert_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_alert_rule got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def create_alert_rule(self, budget_id, create_alert_rule_details, **kwargs): "budgetId": budget_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def create_alert_rule(self, budget_id, create_alert_rule_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def create_budget(self, create_budget_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_budget got unknown kwargs: {extra_kwargs!r}") @@ -290,7 +289,7 @@ def create_budget(self, create_budget_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -380,7 +379,7 @@ def delete_alert_rule(self, budget_id, alert_rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_alert_rule got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def delete_alert_rule(self, budget_id, alert_rule_id, **kwargs): "alertRuleId": alert_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -402,7 +401,7 @@ def delete_alert_rule(self, budget_id, alert_rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -486,7 +485,7 @@ def delete_budget(self, budget_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_budget got unknown kwargs: {extra_kwargs!r}") @@ -495,10 +494,10 @@ def delete_budget(self, budget_id, **kwargs): "budgetId": budget_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -507,7 +506,7 @@ def delete_budget(self, budget_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -586,7 +585,7 @@ def get_alert_rule(self, budget_id, alert_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alert_rule got unknown kwargs: {extra_kwargs!r}") @@ -596,10 +595,10 @@ def get_alert_rule(self, budget_id, alert_rule_id, **kwargs): "alertRuleId": alert_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -607,7 +606,7 @@ def get_alert_rule(self, budget_id, alert_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -685,7 +684,7 @@ def get_budget(self, budget_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_budget got unknown kwargs: {extra_kwargs!r}") @@ -694,10 +693,10 @@ def get_budget(self, budget_id, **kwargs): "budgetId": budget_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -705,7 +704,7 @@ def get_budget(self, budget_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -817,7 +816,7 @@ def list_alert_rules(self, budget_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alert_rules got unknown kwargs: {extra_kwargs!r}") @@ -826,10 +825,10 @@ def list_alert_rules(self, budget_id, **kwargs): "budgetId": budget_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -861,14 +860,14 @@ def list_alert_rules(self, budget_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -997,7 +996,7 @@ def list_budgets(self, compartment_id, **kwargs): "target_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_budgets got unknown kwargs: {extra_kwargs!r}") @@ -1040,14 +1039,14 @@ def list_budgets(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "targetType": kwargs.get("target_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1139,7 +1138,7 @@ def update_alert_rule(self, budget_id, alert_rule_id, update_alert_rule_details, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_alert_rule got unknown kwargs: {extra_kwargs!r}") @@ -1149,10 +1148,10 @@ def update_alert_rule(self, budget_id, alert_rule_id, update_alert_rule_details, "alertRuleId": alert_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1161,7 +1160,7 @@ def update_alert_rule(self, budget_id, alert_rule_id, update_alert_rule_details, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1252,7 +1251,7 @@ def update_budget(self, budget_id, update_budget_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_budget got unknown kwargs: {extra_kwargs!r}") @@ -1261,10 +1260,10 @@ def update_budget(self, budget_id, update_budget_details, **kwargs): "budgetId": budget_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1273,7 +1272,7 @@ def update_budget(self, budget_id, update_budget_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/capacity_management/capacity_management_client.py b/src/oci/capacity_management/capacity_management_client.py index e13851b29e..d68a5c912a 100644 --- a/src/oci/capacity_management/capacity_management_client.py +++ b/src/oci/capacity_management/capacity_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def create_occ_availability_catalog(self, create_occ_availability_catalog_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_occ_availability_catalog got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def create_occ_availability_catalog(self, create_occ_availability_catalog_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -267,7 +266,7 @@ def create_occ_capacity_request(self, create_occ_capacity_request_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -278,7 +277,7 @@ def create_occ_capacity_request(self, create_occ_capacity_request_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -366,7 +365,7 @@ def delete_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_occ_availability_catalog got unknown kwargs: {extra_kwargs!r}") @@ -375,10 +374,10 @@ def delete_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs) "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -387,7 +386,7 @@ def delete_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -472,7 +471,7 @@ def delete_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -481,10 +480,10 @@ def delete_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "occCapacityRequestId": occ_capacity_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -493,7 +492,7 @@ def delete_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -570,7 +569,7 @@ def get_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occ_availability_catalog got unknown kwargs: {extra_kwargs!r}") @@ -579,10 +578,10 @@ def get_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs): "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -590,7 +589,7 @@ def get_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -685,7 +684,7 @@ def get_occ_availability_catalog_content(self, occ_availability_catalog_id, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occ_availability_catalog_content got unknown kwargs: {extra_kwargs!r}") @@ -694,10 +693,10 @@ def get_occ_availability_catalog_content(self, occ_availability_catalog_id, **kw "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -707,7 +706,7 @@ def get_occ_availability_catalog_content(self, occ_availability_catalog_id, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -787,7 +786,7 @@ def get_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -796,10 +795,10 @@ def get_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "occCapacityRequestId": occ_capacity_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -807,7 +806,7 @@ def get_occ_capacity_request(self, occ_capacity_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -886,7 +885,7 @@ def get_occ_customer_group(self, occ_customer_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occ_customer_group got unknown kwargs: {extra_kwargs!r}") @@ -895,10 +894,10 @@ def get_occ_customer_group(self, occ_customer_group_id, **kwargs): "occCustomerGroupId": occ_customer_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -906,7 +905,7 @@ def get_occ_customer_group(self, occ_customer_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1025,7 +1024,7 @@ def list_occ_availabilities(self, occ_availability_catalog_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_availabilities got unknown kwargs: {extra_kwargs!r}") @@ -1034,10 +1033,10 @@ def list_occ_availabilities(self, occ_availability_catalog_id, **kwargs): "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'resource_type' in kwargs: @@ -1078,14 +1077,14 @@ def list_occ_availabilities(self, occ_availability_catalog_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1206,7 +1205,7 @@ def list_occ_availability_catalogs(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_availability_catalogs got unknown kwargs: {extra_kwargs!r}") @@ -1250,14 +1249,14 @@ def list_occ_availability_catalogs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1380,7 +1379,7 @@ def list_occ_availability_catalogs_internal(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_availability_catalogs_internal got unknown kwargs: {extra_kwargs!r}") @@ -1425,14 +1424,14 @@ def list_occ_availability_catalogs_internal(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1549,7 +1548,7 @@ def list_occ_capacity_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_capacity_requests got unknown kwargs: {extra_kwargs!r}") @@ -1586,14 +1585,14 @@ def list_occ_capacity_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1714,7 +1713,7 @@ def list_occ_capacity_requests_internal(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_capacity_requests_internal got unknown kwargs: {extra_kwargs!r}") @@ -1752,14 +1751,14 @@ def list_occ_capacity_requests_internal(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1872,7 +1871,7 @@ def list_occ_customer_groups(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_occ_customer_groups got unknown kwargs: {extra_kwargs!r}") @@ -1908,14 +1907,14 @@ def list_occ_customer_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2005,7 +2004,7 @@ def patch_occ_capacity_request(self, patch_occ_capacity_request_details, occ_cap "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -2014,10 +2013,10 @@ def patch_occ_capacity_request(self, patch_occ_capacity_request_details, occ_cap "occCapacityRequestId": occ_capacity_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2026,7 +2025,7 @@ def patch_occ_capacity_request(self, patch_occ_capacity_request_details, occ_cap "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2123,7 +2122,7 @@ def publish_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_occ_availability_catalog got unknown kwargs: {extra_kwargs!r}") @@ -2132,10 +2131,10 @@ def publish_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2145,7 +2144,7 @@ def publish_occ_availability_catalog(self, occ_availability_catalog_id, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2234,7 +2233,7 @@ def update_internal_occ_capacity_request(self, update_internal_occ_capacity_requ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_internal_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -2243,10 +2242,10 @@ def update_internal_occ_capacity_request(self, update_internal_occ_capacity_requ "occCapacityRequestId": occ_capacity_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2255,7 +2254,7 @@ def update_internal_occ_capacity_request(self, update_internal_occ_capacity_requ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2347,7 +2346,7 @@ def update_occ_availability_catalog(self, update_occ_availability_catalog_detail "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_occ_availability_catalog got unknown kwargs: {extra_kwargs!r}") @@ -2356,10 +2355,10 @@ def update_occ_availability_catalog(self, update_occ_availability_catalog_detail "occAvailabilityCatalogId": occ_availability_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2368,7 +2367,7 @@ def update_occ_availability_catalog(self, update_occ_availability_catalog_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2460,7 +2459,7 @@ def update_occ_capacity_request(self, update_occ_capacity_request_details, occ_c "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -2469,10 +2468,10 @@ def update_occ_capacity_request(self, update_occ_capacity_request_details, occ_c "occCapacityRequestId": occ_capacity_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2481,7 +2480,7 @@ def update_occ_capacity_request(self, update_occ_capacity_request_details, occ_c "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/certificates/certificates_client.py b/src/oci/certificates/certificates_client.py index 97fc9251b1..af0d515a5f 100644 --- a/src/oci/certificates/certificates_client.py +++ b/src/oci/certificates/certificates_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -159,7 +158,7 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -168,10 +167,10 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "caBundleId": ca_bundle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -179,7 +178,7 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def get_certificate_authority_bundle(self, certificate_authority_id, **kwargs): "certificate_authority_version_name", "stage" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate_authority_bundle got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def get_certificate_authority_bundle(self, certificate_authority_id, **kwargs): "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'stage' in kwargs: @@ -298,14 +297,14 @@ def get_certificate_authority_bundle(self, certificate_authority_id, **kwargs): "certificateAuthorityVersionName": kwargs.get("certificate_authority_version_name", missing), "stage": kwargs.get("stage", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -408,7 +407,7 @@ def get_certificate_bundle(self, certificate_id, **kwargs): "stage", "certificate_bundle_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate_bundle got unknown kwargs: {extra_kwargs!r}") @@ -417,10 +416,10 @@ def get_certificate_bundle(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'stage' in kwargs: @@ -443,14 +442,14 @@ def get_certificate_bundle(self, certificate_id, **kwargs): "stage": kwargs.get("stage", missing), "certificateBundleType": kwargs.get("certificate_bundle_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -542,7 +541,7 @@ def list_certificate_authority_bundle_versions(self, certificate_authority_id, * "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificate_authority_bundle_versions got unknown kwargs: {extra_kwargs!r}") @@ -551,10 +550,10 @@ def list_certificate_authority_bundle_versions(self, certificate_authority_id, * "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -575,14 +574,14 @@ def list_certificate_authority_bundle_versions(self, certificate_authority_id, * "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -674,7 +673,7 @@ def list_certificate_bundle_versions(self, certificate_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificate_bundle_versions got unknown kwargs: {extra_kwargs!r}") @@ -683,10 +682,10 @@ def list_certificate_bundle_versions(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -707,14 +706,14 @@ def list_certificate_bundle_versions(self, certificate_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/certificates_management/certificates_management_client.py b/src/oci/certificates_management/certificates_management_client.py index 8796f47ea2..3d957fce68 100644 --- a/src/oci/certificates_management/certificates_management_client.py +++ b/src/oci/certificates_management/certificates_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def cancel_certificate_authority_deletion(self, certificate_authority_id, **kwar "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_certificate_authority_deletion got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def cancel_certificate_authority_deletion(self, certificate_authority_id, **kwar "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def cancel_certificate_authority_deletion(self, certificate_authority_id, **kwar "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def cancel_certificate_authority_version_deletion(self, certificate_authority_id "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_certificate_authority_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -288,10 +287,10 @@ def cancel_certificate_authority_version_deletion(self, certificate_authority_id "certificateAuthorityVersionNumber": certificate_authority_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -300,7 +299,7 @@ def cancel_certificate_authority_version_deletion(self, certificate_authority_id "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -386,7 +385,7 @@ def cancel_certificate_deletion(self, certificate_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_certificate_deletion got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def cancel_certificate_deletion(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -407,7 +406,7 @@ def cancel_certificate_deletion(self, certificate_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -494,7 +493,7 @@ def cancel_certificate_version_deletion(self, certificate_id, certificate_versio "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_certificate_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -504,10 +503,10 @@ def cancel_certificate_version_deletion(self, certificate_id, certificate_versio "certificateVersionNumber": certificate_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -516,7 +515,7 @@ def cancel_certificate_version_deletion(self, certificate_id, certificate_versio "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -617,7 +616,7 @@ def change_ca_bundle_compartment(self, ca_bundle_id, change_ca_bundle_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ca_bundle_compartment got unknown kwargs: {extra_kwargs!r}") @@ -626,10 +625,10 @@ def change_ca_bundle_compartment(self, ca_bundle_id, change_ca_bundle_compartmen "caBundleId": ca_bundle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -639,7 +638,7 @@ def change_ca_bundle_compartment(self, ca_bundle_id, change_ca_bundle_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -743,7 +742,7 @@ def change_certificate_authority_compartment(self, certificate_authority_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_certificate_authority_compartment got unknown kwargs: {extra_kwargs!r}") @@ -752,10 +751,10 @@ def change_certificate_authority_compartment(self, certificate_authority_id, cha "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -765,7 +764,7 @@ def change_certificate_authority_compartment(self, certificate_authority_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -869,7 +868,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_certificate_compartment got unknown kwargs: {extra_kwargs!r}") @@ -878,10 +877,10 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -891,7 +890,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -979,7 +978,7 @@ def create_ca_bundle(self, create_ca_bundle_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -990,7 +989,7 @@ def create_ca_bundle(self, create_ca_bundle_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1078,7 +1077,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1089,7 +1088,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1177,7 +1176,7 @@ def create_certificate_authority(self, create_certificate_authority_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate_authority got unknown kwargs: {extra_kwargs!r}") @@ -1188,7 +1187,7 @@ def create_certificate_authority(self, create_certificate_authority_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1275,7 +1274,7 @@ def delete_ca_bundle(self, ca_bundle_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -1284,10 +1283,10 @@ def delete_ca_bundle(self, ca_bundle_id, **kwargs): "caBundleId": ca_bundle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1296,7 +1295,7 @@ def delete_ca_bundle(self, ca_bundle_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1372,7 +1371,7 @@ def get_association(self, association_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_association got unknown kwargs: {extra_kwargs!r}") @@ -1381,10 +1380,10 @@ def get_association(self, association_id, **kwargs): "associationId": association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1392,7 +1391,7 @@ def get_association(self, association_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1470,7 +1469,7 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -1479,10 +1478,10 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "caBundleId": ca_bundle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1490,7 +1489,7 @@ def get_ca_bundle(self, ca_bundle_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1568,7 +1567,7 @@ def get_certificate(self, certificate_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1577,10 +1576,10 @@ def get_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1588,7 +1587,7 @@ def get_certificate(self, certificate_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1666,7 +1665,7 @@ def get_certificate_authority(self, certificate_authority_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate_authority got unknown kwargs: {extra_kwargs!r}") @@ -1675,10 +1674,10 @@ def get_certificate_authority(self, certificate_authority_id, **kwargs): "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1686,7 +1685,7 @@ def get_certificate_authority(self, certificate_authority_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1767,7 +1766,7 @@ def get_certificate_authority_version(self, certificate_authority_id, certificat "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate_authority_version got unknown kwargs: {extra_kwargs!r}") @@ -1777,10 +1776,10 @@ def get_certificate_authority_version(self, certificate_authority_id, certificat "certificateAuthorityVersionNumber": certificate_authority_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1788,7 +1787,7 @@ def get_certificate_authority_version(self, certificate_authority_id, certificat "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1869,7 +1868,7 @@ def get_certificate_version(self, certificate_id, certificate_version_number, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate_version got unknown kwargs: {extra_kwargs!r}") @@ -1879,10 +1878,10 @@ def get_certificate_version(self, certificate_id, certificate_version_number, ** "certificateVersionNumber": certificate_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1890,7 +1889,7 @@ def get_certificate_version(self, certificate_id, certificate_version_number, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2014,7 +2013,7 @@ def list_associations(self, **kwargs): "page", "association_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_associations got unknown kwargs: {extra_kwargs!r}") @@ -2052,14 +2051,14 @@ def list_associations(self, **kwargs): "page": kwargs.get("page", missing), "associationType": kwargs.get("association_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2175,7 +2174,7 @@ def list_ca_bundles(self, **kwargs): "page", "ca_bundle_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ca_bundles got unknown kwargs: {extra_kwargs!r}") @@ -2211,14 +2210,14 @@ def list_ca_bundles(self, **kwargs): "page": kwargs.get("page", missing), "caBundleId": kwargs.get("ca_bundle_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2339,7 +2338,7 @@ def list_certificate_authorities(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificate_authorities got unknown kwargs: {extra_kwargs!r}") @@ -2376,14 +2375,14 @@ def list_certificate_authorities(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2487,7 +2486,7 @@ def list_certificate_authority_versions(self, certificate_authority_id, **kwargs "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificate_authority_versions got unknown kwargs: {extra_kwargs!r}") @@ -2496,10 +2495,10 @@ def list_certificate_authority_versions(self, certificate_authority_id, **kwargs "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2523,14 +2522,14 @@ def list_certificate_authority_versions(self, certificate_authority_id, **kwargs "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2636,7 +2635,7 @@ def list_certificate_versions(self, certificate_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificate_versions got unknown kwargs: {extra_kwargs!r}") @@ -2645,10 +2644,10 @@ def list_certificate_versions(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2672,14 +2671,14 @@ def list_certificate_versions(self, certificate_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2802,7 +2801,7 @@ def list_certificates(self, **kwargs): "issuer_certificate_authority_id", "certificate_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificates got unknown kwargs: {extra_kwargs!r}") @@ -2839,14 +2838,14 @@ def list_certificates(self, **kwargs): "issuerCertificateAuthorityId": kwargs.get("issuer_certificate_authority_id", missing), "certificateId": kwargs.get("certificate_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2947,7 +2946,7 @@ def revoke_certificate_authority_version(self, certificate_authority_id, certifi "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"revoke_certificate_authority_version got unknown kwargs: {extra_kwargs!r}") @@ -2957,10 +2956,10 @@ def revoke_certificate_authority_version(self, certificate_authority_id, certifi "certificateAuthorityVersionNumber": certificate_authority_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2970,7 +2969,7 @@ def revoke_certificate_authority_version(self, certificate_authority_id, certifi "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3072,7 +3071,7 @@ def revoke_certificate_version(self, certificate_id, certificate_version_number, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"revoke_certificate_version got unknown kwargs: {extra_kwargs!r}") @@ -3082,10 +3081,10 @@ def revoke_certificate_version(self, certificate_id, certificate_version_number, "certificateVersionNumber": certificate_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3095,7 +3094,7 @@ def revoke_certificate_version(self, certificate_id, certificate_version_number, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3185,7 +3184,7 @@ def schedule_certificate_authority_deletion(self, certificate_authority_id, sche "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_certificate_authority_deletion got unknown kwargs: {extra_kwargs!r}") @@ -3194,10 +3193,10 @@ def schedule_certificate_authority_deletion(self, certificate_authority_id, sche "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3206,7 +3205,7 @@ def schedule_certificate_authority_deletion(self, certificate_authority_id, sche "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3300,7 +3299,7 @@ def schedule_certificate_authority_version_deletion(self, certificate_authority_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_certificate_authority_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -3310,10 +3309,10 @@ def schedule_certificate_authority_version_deletion(self, certificate_authority_ "certificateAuthorityVersionNumber": certificate_authority_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3322,7 +3321,7 @@ def schedule_certificate_authority_version_deletion(self, certificate_authority_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3416,7 +3415,7 @@ def schedule_certificate_deletion(self, certificate_id, schedule_certificate_del "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_certificate_deletion got unknown kwargs: {extra_kwargs!r}") @@ -3425,10 +3424,10 @@ def schedule_certificate_deletion(self, certificate_id, schedule_certificate_del "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3437,7 +3436,7 @@ def schedule_certificate_deletion(self, certificate_id, schedule_certificate_del "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3532,7 +3531,7 @@ def schedule_certificate_version_deletion(self, certificate_id, certificate_vers "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_certificate_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -3542,10 +3541,10 @@ def schedule_certificate_version_deletion(self, certificate_id, certificate_vers "certificateVersionNumber": certificate_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3554,7 +3553,7 @@ def schedule_certificate_version_deletion(self, certificate_id, certificate_vers "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3643,7 +3642,7 @@ def update_ca_bundle(self, ca_bundle_id, update_ca_bundle_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -3652,10 +3651,10 @@ def update_ca_bundle(self, ca_bundle_id, update_ca_bundle_details, **kwargs): "caBundleId": ca_bundle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3664,7 +3663,7 @@ def update_ca_bundle(self, ca_bundle_id, update_ca_bundle_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3755,7 +3754,7 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_certificate got unknown kwargs: {extra_kwargs!r}") @@ -3764,10 +3763,10 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3776,7 +3775,7 @@ def update_certificate(self, certificate_id, update_certificate_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3867,7 +3866,7 @@ def update_certificate_authority(self, certificate_authority_id, update_certific "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_certificate_authority got unknown kwargs: {extra_kwargs!r}") @@ -3876,10 +3875,10 @@ def update_certificate_authority(self, certificate_authority_id, update_certific "certificateAuthorityId": certificate_authority_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3888,7 +3887,7 @@ def update_certificate_authority(self, certificate_authority_id, update_certific "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cims/incident_client.py b/src/oci/cims/incident_client.py index e90643756f..72dea8a2ca 100644 --- a/src/oci/cims/incident_client.py +++ b/src/oci/cims/incident_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -187,7 +186,7 @@ def create_incident(self, create_incident_details, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_incident got unknown kwargs: {extra_kwargs!r}") @@ -203,7 +202,7 @@ def create_incident(self, create_incident_details, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -306,7 +305,7 @@ def get_csi_number(self, tenant_id, region, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_csi_number got unknown kwargs: {extra_kwargs!r}") @@ -315,7 +314,7 @@ def get_csi_number(self, tenant_id, region, **kwargs): "tenantId": tenant_id, "region": region } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -328,7 +327,7 @@ def get_csi_number(self, tenant_id, region, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -440,7 +439,7 @@ def get_incident(self, incident_key, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_incident got unknown kwargs: {extra_kwargs!r}") @@ -449,16 +448,16 @@ def get_incident(self, incident_key, **kwargs): "incidentKey": incident_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -473,7 +472,7 @@ def get_incident(self, incident_key, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -556,7 +555,7 @@ def get_status(self, **kwargs): "ocid", "homeregion" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_status got unknown kwargs: {extra_kwargs!r}") @@ -568,7 +567,7 @@ def get_status(self, **kwargs): "ocid": kwargs.get("ocid", missing), "homeregion": kwargs.get("homeregion", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -689,7 +688,7 @@ def list_incident_resource_types(self, problem_type, compartment_id, **kwargs): "homeregion", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_incident_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -717,7 +716,7 @@ def list_incident_resource_types(self, problem_type, compartment_id, **kwargs): "compartmentId": compartment_id, "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -728,7 +727,7 @@ def list_incident_resource_types(self, problem_type, compartment_id, **kwargs): "homeregion": kwargs.get("homeregion", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -866,7 +865,7 @@ def list_incidents(self, compartment_id, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_incidents got unknown kwargs: {extra_kwargs!r}") @@ -901,7 +900,7 @@ def list_incidents(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "problemType": kwargs.get("problem_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -915,7 +914,7 @@ def list_incidents(self, compartment_id, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1030,7 +1029,7 @@ def update_incident(self, incident_key, update_incident_details, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_incident got unknown kwargs: {extra_kwargs!r}") @@ -1039,16 +1038,16 @@ def update_incident(self, incident_key, update_incident_details, **kwargs): "incidentKey": incident_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1063,7 +1062,7 @@ def update_incident(self, incident_key, update_incident_details, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1174,7 +1173,7 @@ def validate_user(self, **kwargs): "idtoken", "domainid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_user got unknown kwargs: {extra_kwargs!r}") @@ -1189,7 +1188,7 @@ def validate_user(self, **kwargs): query_params = { "problemType": kwargs.get("problem_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1203,7 +1202,7 @@ def validate_user(self, **kwargs): "idtoken": kwargs.get("idtoken", missing), "domainid": kwargs.get("domainid", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cims/user_client.py b/src/oci/cims/user_client.py index 07b3fd9d2e..1a2527097a 100644 --- a/src/oci/cims/user_client.py +++ b/src/oci/cims/user_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -160,7 +159,7 @@ def create_user(self, create_user_details, ocid, **kwargs): "opc_request_id", "homeregion" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -172,7 +171,7 @@ def create_user(self, create_user_details, ocid, **kwargs): "ocid": ocid, "homeregion": kwargs.get("homeregion", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_bridge/common_client.py b/src/oci/cloud_bridge/common_client.py index 5667871305..e441776a81 100644 --- a/src/oci/cloud_bridge/common_client.py +++ b/src/oci/cloud_bridge/common_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -263,7 +262,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -272,10 +271,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -283,7 +282,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -381,7 +380,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -416,14 +415,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -523,7 +522,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -532,10 +531,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -558,14 +557,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -679,7 +678,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -715,14 +714,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_bridge/discovery_client.py b/src/oci/cloud_bridge/discovery_client.py index 4383047624..44076d835b 100644 --- a/src/oci/cloud_bridge/discovery_client.py +++ b/src/oci/cloud_bridge/discovery_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_asset_source_compartment(self, asset_source_id, change_asset_source_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_asset_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_asset_source_compartment(self, asset_source_id, change_asset_source_c "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_asset_source_compartment(self, asset_source_id, change_asset_source_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -301,7 +300,7 @@ def change_discovery_schedule_compartment(self, discovery_schedule_id, change_di "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_discovery_schedule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -310,10 +309,10 @@ def change_discovery_schedule_compartment(self, discovery_schedule_id, change_di "discoveryScheduleId": discovery_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -323,7 +322,7 @@ def change_discovery_schedule_compartment(self, discovery_schedule_id, change_di "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -410,7 +409,7 @@ def create_asset_source(self, create_asset_source_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_asset_source got unknown kwargs: {extra_kwargs!r}") @@ -421,7 +420,7 @@ def create_asset_source(self, create_asset_source_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -508,7 +507,7 @@ def create_discovery_schedule(self, create_discovery_schedule_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_discovery_schedule got unknown kwargs: {extra_kwargs!r}") @@ -519,7 +518,7 @@ def create_discovery_schedule(self, create_discovery_schedule_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -608,7 +607,7 @@ def delete_asset_source(self, asset_source_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_asset_source got unknown kwargs: {extra_kwargs!r}") @@ -617,10 +616,10 @@ def delete_asset_source(self, asset_source_id, **kwargs): "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -629,7 +628,7 @@ def delete_asset_source(self, asset_source_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -715,7 +714,7 @@ def delete_discovery_schedule(self, discovery_schedule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_discovery_schedule got unknown kwargs: {extra_kwargs!r}") @@ -724,10 +723,10 @@ def delete_discovery_schedule(self, discovery_schedule_id, **kwargs): "discoveryScheduleId": discovery_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -736,7 +735,7 @@ def delete_discovery_schedule(self, discovery_schedule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -814,7 +813,7 @@ def get_asset_source(self, asset_source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_asset_source got unknown kwargs: {extra_kwargs!r}") @@ -823,10 +822,10 @@ def get_asset_source(self, asset_source_id, **kwargs): "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -834,7 +833,7 @@ def get_asset_source(self, asset_source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -914,7 +913,7 @@ def get_discovery_schedule(self, discovery_schedule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_discovery_schedule got unknown kwargs: {extra_kwargs!r}") @@ -923,10 +922,10 @@ def get_discovery_schedule(self, discovery_schedule_id, **kwargs): "discoveryScheduleId": discovery_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -934,7 +933,7 @@ def get_discovery_schedule(self, discovery_schedule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1022,7 +1021,7 @@ def list_asset_source_connections(self, asset_source_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_asset_source_connections got unknown kwargs: {extra_kwargs!r}") @@ -1031,24 +1030,24 @@ def list_asset_source_connections(self, asset_source_id, **kwargs): "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1164,7 +1163,7 @@ def list_asset_sources(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_asset_sources got unknown kwargs: {extra_kwargs!r}") @@ -1200,14 +1199,14 @@ def list_asset_sources(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1321,7 +1320,7 @@ def list_discovery_schedules(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_schedules got unknown kwargs: {extra_kwargs!r}") @@ -1357,14 +1356,14 @@ def list_discovery_schedules(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1452,7 +1451,7 @@ def refresh_asset_source(self, asset_source_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_asset_source got unknown kwargs: {extra_kwargs!r}") @@ -1461,10 +1460,10 @@ def refresh_asset_source(self, asset_source_id, **kwargs): "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1473,7 +1472,7 @@ def refresh_asset_source(self, asset_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1563,7 +1562,7 @@ def update_asset_source(self, asset_source_id, update_asset_source_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_asset_source got unknown kwargs: {extra_kwargs!r}") @@ -1572,10 +1571,10 @@ def update_asset_source(self, asset_source_id, update_asset_source_details, **kw "assetSourceId": asset_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1584,7 +1583,7 @@ def update_asset_source(self, asset_source_id, update_asset_source_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1675,7 +1674,7 @@ def update_discovery_schedule(self, update_discovery_schedule_details, discovery "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_discovery_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1684,10 +1683,10 @@ def update_discovery_schedule(self, update_discovery_schedule_details, discovery "discoveryScheduleId": discovery_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1696,7 +1695,7 @@ def update_discovery_schedule(self, update_discovery_schedule_details, discovery "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_bridge/inventory_client.py b/src/oci/cloud_bridge/inventory_client.py index 6088ccb636..417a4d3658 100644 --- a/src/oci/cloud_bridge/inventory_client.py +++ b/src/oci/cloud_bridge/inventory_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -204,7 +203,7 @@ def analyze_assets(self, compartment_id, aggregation_properties, **kwargs): "group_by", "inventory_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"analyze_assets got unknown kwargs: {extra_kwargs!r}") @@ -243,14 +242,14 @@ def analyze_assets(self, compartment_id, aggregation_properties, **kwargs): "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi'), "inventoryId": kwargs.get("inventory_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -347,7 +346,7 @@ def change_asset_compartment(self, asset_id, change_asset_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_asset_compartment got unknown kwargs: {extra_kwargs!r}") @@ -356,10 +355,10 @@ def change_asset_compartment(self, asset_id, change_asset_compartment_details, * "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -369,7 +368,7 @@ def change_asset_compartment(self, asset_id, change_asset_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -467,7 +466,7 @@ def change_asset_tags(self, asset_id, change_asset_tags_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_asset_tags got unknown kwargs: {extra_kwargs!r}") @@ -476,10 +475,10 @@ def change_asset_tags(self, asset_id, change_asset_tags_details, **kwargs): "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -489,7 +488,7 @@ def change_asset_tags(self, asset_id, change_asset_tags_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -578,7 +577,7 @@ def create_asset(self, create_asset_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_asset got unknown kwargs: {extra_kwargs!r}") @@ -589,7 +588,7 @@ def create_asset(self, create_asset_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -676,7 +675,7 @@ def create_inventory(self, create_inventory_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_inventory got unknown kwargs: {extra_kwargs!r}") @@ -687,7 +686,7 @@ def create_inventory(self, create_inventory_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -772,7 +771,7 @@ def delete_asset(self, asset_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_asset got unknown kwargs: {extra_kwargs!r}") @@ -781,10 +780,10 @@ def delete_asset(self, asset_id, **kwargs): "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -793,7 +792,7 @@ def delete_asset(self, asset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -877,7 +876,7 @@ def delete_inventory(self, inventory_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_inventory got unknown kwargs: {extra_kwargs!r}") @@ -886,10 +885,10 @@ def delete_inventory(self, inventory_id, **kwargs): "inventoryId": inventory_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -898,7 +897,7 @@ def delete_inventory(self, inventory_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -974,7 +973,7 @@ def get_asset(self, asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_asset got unknown kwargs: {extra_kwargs!r}") @@ -983,10 +982,10 @@ def get_asset(self, asset_id, **kwargs): "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -994,7 +993,7 @@ def get_asset(self, asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1072,7 +1071,7 @@ def get_inventory(self, inventory_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_inventory got unknown kwargs: {extra_kwargs!r}") @@ -1081,10 +1080,10 @@ def get_inventory(self, inventory_id, **kwargs): "inventoryId": inventory_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1092,7 +1091,7 @@ def get_inventory(self, inventory_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1181,7 +1180,7 @@ def import_inventory(self, import_inventory_details, inventory_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_inventory got unknown kwargs: {extra_kwargs!r}") @@ -1190,10 +1189,10 @@ def import_inventory(self, import_inventory_details, inventory_id, **kwargs): "inventoryId": inventory_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1202,7 +1201,7 @@ def import_inventory(self, import_inventory_details, inventory_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1333,7 +1332,7 @@ def list_assets(self, compartment_id, **kwargs): "opc_request_id", "inventory_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_assets got unknown kwargs: {extra_kwargs!r}") @@ -1380,14 +1379,14 @@ def list_assets(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "inventoryId": kwargs.get("inventory_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1485,7 +1484,7 @@ def list_historical_metrics(self, asset_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_historical_metrics got unknown kwargs: {extra_kwargs!r}") @@ -1494,10 +1493,10 @@ def list_historical_metrics(self, asset_id, **kwargs): "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1520,14 +1519,14 @@ def list_historical_metrics(self, asset_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1633,7 +1632,7 @@ def list_inventories(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_inventories got unknown kwargs: {extra_kwargs!r}") @@ -1667,14 +1666,14 @@ def list_inventories(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1763,7 +1762,7 @@ def submit_historical_metrics(self, submit_historical_metrics_details, asset_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"submit_historical_metrics got unknown kwargs: {extra_kwargs!r}") @@ -1772,10 +1771,10 @@ def submit_historical_metrics(self, submit_historical_metrics_details, asset_id, "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1784,7 +1783,7 @@ def submit_historical_metrics(self, submit_historical_metrics_details, asset_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1875,7 +1874,7 @@ def update_asset(self, asset_id, update_asset_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_asset got unknown kwargs: {extra_kwargs!r}") @@ -1884,10 +1883,10 @@ def update_asset(self, asset_id, update_asset_details, **kwargs): "assetId": asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1896,7 +1895,7 @@ def update_asset(self, asset_id, update_asset_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1987,7 +1986,7 @@ def update_inventory(self, inventory_id, update_inventory_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_inventory got unknown kwargs: {extra_kwargs!r}") @@ -1996,10 +1995,10 @@ def update_inventory(self, inventory_id, update_inventory_details, **kwargs): "inventoryId": inventory_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2008,7 +2007,7 @@ def update_inventory(self, inventory_id, update_inventory_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_bridge/ocb_agent_svc_client.py b/src/oci/cloud_bridge/ocb_agent_svc_client.py index 5f44a7b003..2452e40b30 100644 --- a/src/oci/cloud_bridge/ocb_agent_svc_client.py +++ b/src/oci/cloud_bridge/ocb_agent_svc_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def add_agent_dependency(self, environment_id, add_agent_dependency_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def add_agent_dependency(self, environment_id, add_agent_dependency_details, **k "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def add_agent_dependency(self, environment_id, add_agent_dependency_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_agent_compartment got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -321,7 +320,7 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -419,7 +418,7 @@ def change_agent_dependency_compartment(self, agent_dependency_id, change_agent_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_agent_dependency_compartment got unknown kwargs: {extra_kwargs!r}") @@ -428,10 +427,10 @@ def change_agent_dependency_compartment(self, agent_dependency_id, change_agent_ "agentDependencyId": agent_dependency_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -441,7 +440,7 @@ def change_agent_dependency_compartment(self, agent_dependency_id, change_agent_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -539,7 +538,7 @@ def change_environment_compartment(self, environment_id, change_environment_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_environment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -548,10 +547,10 @@ def change_environment_compartment(self, environment_id, change_environment_comp "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -561,7 +560,7 @@ def change_environment_compartment(self, environment_id, change_environment_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -648,7 +647,7 @@ def create_agent(self, create_agent_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_agent got unknown kwargs: {extra_kwargs!r}") @@ -659,7 +658,7 @@ def create_agent(self, create_agent_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -746,7 +745,7 @@ def create_agent_dependency(self, create_agent_dependency_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -757,7 +756,7 @@ def create_agent_dependency(self, create_agent_dependency_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -844,7 +843,7 @@ def create_environment(self, create_environment_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_environment got unknown kwargs: {extra_kwargs!r}") @@ -855,7 +854,7 @@ def create_environment(self, create_environment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -950,7 +949,7 @@ def delete_agent(self, agent_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_agent got unknown kwargs: {extra_kwargs!r}") @@ -959,10 +958,10 @@ def delete_agent(self, agent_id, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -972,7 +971,7 @@ def delete_agent(self, agent_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1057,7 +1056,7 @@ def delete_agent_dependency(self, agent_dependency_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -1066,10 +1065,10 @@ def delete_agent_dependency(self, agent_dependency_id, **kwargs): "agentDependencyId": agent_dependency_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1078,7 +1077,7 @@ def delete_agent_dependency(self, agent_dependency_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1162,7 +1161,7 @@ def delete_environment(self, environment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_environment got unknown kwargs: {extra_kwargs!r}") @@ -1171,10 +1170,10 @@ def delete_environment(self, environment_id, **kwargs): "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1183,7 +1182,7 @@ def delete_environment(self, environment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1259,7 +1258,7 @@ def get_agent(self, agent_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_agent got unknown kwargs: {extra_kwargs!r}") @@ -1268,10 +1267,10 @@ def get_agent(self, agent_id, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1279,7 +1278,7 @@ def get_agent(self, agent_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1357,7 +1356,7 @@ def get_agent_dependency(self, agent_dependency_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -1366,10 +1365,10 @@ def get_agent_dependency(self, agent_dependency_id, **kwargs): "agentDependencyId": agent_dependency_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1377,7 +1376,7 @@ def get_agent_dependency(self, agent_dependency_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1455,7 +1454,7 @@ def get_environment(self, environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_environment got unknown kwargs: {extra_kwargs!r}") @@ -1464,10 +1463,10 @@ def get_environment(self, environment_id, **kwargs): "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1475,7 +1474,7 @@ def get_environment(self, environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1556,7 +1555,7 @@ def get_plugin(self, agent_id, plugin_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_plugin got unknown kwargs: {extra_kwargs!r}") @@ -1566,10 +1565,10 @@ def get_plugin(self, agent_id, plugin_name, **kwargs): "pluginName": plugin_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1577,7 +1576,7 @@ def get_plugin(self, agent_id, plugin_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1693,7 +1692,7 @@ def list_agent_dependencies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_agent_dependencies got unknown kwargs: {extra_kwargs!r}") @@ -1730,14 +1729,14 @@ def list_agent_dependencies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1853,7 +1852,7 @@ def list_agents(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_agents got unknown kwargs: {extra_kwargs!r}") @@ -1890,14 +1889,14 @@ def list_agents(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1999,7 +1998,7 @@ def list_appliance_images(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_appliance_images got unknown kwargs: {extra_kwargs!r}") @@ -2026,14 +2025,14 @@ def list_appliance_images(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2145,7 +2144,7 @@ def list_environments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_environments got unknown kwargs: {extra_kwargs!r}") @@ -2181,14 +2180,14 @@ def list_environments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2285,7 +2284,7 @@ def remove_agent_dependency(self, environment_id, remove_agent_dependency_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -2294,10 +2293,10 @@ def remove_agent_dependency(self, environment_id, remove_agent_dependency_detail "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2307,7 +2306,7 @@ def remove_agent_dependency(self, environment_id, remove_agent_dependency_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2407,7 +2406,7 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_agent got unknown kwargs: {extra_kwargs!r}") @@ -2416,10 +2415,10 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2429,7 +2428,7 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2529,7 +2528,7 @@ def update_agent_dependency(self, agent_dependency_id, update_agent_dependency_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_agent_dependency got unknown kwargs: {extra_kwargs!r}") @@ -2538,10 +2537,10 @@ def update_agent_dependency(self, agent_dependency_id, update_agent_dependency_d "agentDependencyId": agent_dependency_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2551,7 +2550,7 @@ def update_agent_dependency(self, agent_dependency_id, update_agent_dependency_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2649,7 +2648,7 @@ def update_environment(self, environment_id, update_environment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_environment got unknown kwargs: {extra_kwargs!r}") @@ -2658,10 +2657,10 @@ def update_environment(self, environment_id, update_environment_details, **kwarg "environmentId": environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2671,7 +2670,7 @@ def update_environment(self, environment_id, update_environment_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2766,7 +2765,7 @@ def update_plugin(self, agent_id, plugin_name, update_plugin_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_plugin got unknown kwargs: {extra_kwargs!r}") @@ -2776,10 +2775,10 @@ def update_plugin(self, agent_id, plugin_name, update_plugin_details, **kwargs): "pluginName": plugin_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2788,7 +2787,7 @@ def update_plugin(self, agent_id, plugin_name, update_plugin_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_guard/cloud_guard_client.py b/src/oci/cloud_guard/cloud_guard_client.py index 54a7aadf14..4739ff2584 100644 --- a/src/oci/cloud_guard/cloud_guard_client.py +++ b/src/oci/cloud_guard/cloud_guard_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def add_compartment(self, security_zone_id, add_compartment_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def add_compartment(self, security_zone_id, add_compartment_details, **kwargs): "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def add_compartment(self, security_zone_id, add_compartment_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -288,7 +287,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -297,10 +296,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -309,7 +308,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -402,7 +401,7 @@ def change_data_source_compartment(self, data_source_id, change_data_source_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_data_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -411,10 +410,10 @@ def change_data_source_compartment(self, data_source_id, change_data_source_comp "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -424,7 +423,7 @@ def change_data_source_compartment(self, data_source_id, change_data_source_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -520,7 +519,7 @@ def change_detector_recipe_compartment(self, detector_recipe_id, change_detector "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_detector_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -529,10 +528,10 @@ def change_detector_recipe_compartment(self, detector_recipe_id, change_detector "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -542,7 +541,7 @@ def change_detector_recipe_compartment(self, detector_recipe_id, change_detector "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -638,7 +637,7 @@ def change_managed_list_compartment(self, managed_list_id, change_managed_list_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_managed_list_compartment got unknown kwargs: {extra_kwargs!r}") @@ -647,10 +646,10 @@ def change_managed_list_compartment(self, managed_list_id, change_managed_list_c "managedListId": managed_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -660,7 +659,7 @@ def change_managed_list_compartment(self, managed_list_id, change_managed_list_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -756,7 +755,7 @@ def change_responder_recipe_compartment(self, responder_recipe_id, change_respon "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_responder_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -765,10 +764,10 @@ def change_responder_recipe_compartment(self, responder_recipe_id, change_respon "responderRecipeId": responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -778,7 +777,7 @@ def change_responder_recipe_compartment(self, responder_recipe_id, change_respon "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -874,7 +873,7 @@ def change_security_recipe_compartment(self, security_recipe_id, change_security "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -883,10 +882,10 @@ def change_security_recipe_compartment(self, security_recipe_id, change_security "securityRecipeId": security_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -896,7 +895,7 @@ def change_security_recipe_compartment(self, security_recipe_id, change_security "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -992,7 +991,7 @@ def change_security_zone_compartment(self, security_zone_id, change_security_zon "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_zone_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1001,10 +1000,10 @@ def change_security_zone_compartment(self, security_zone_id, change_security_zon "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1014,7 +1013,7 @@ def change_security_zone_compartment(self, security_zone_id, change_security_zon "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1099,7 +1098,7 @@ def create_data_mask_rule(self, create_data_mask_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_mask_rule got unknown kwargs: {extra_kwargs!r}") @@ -1110,7 +1109,7 @@ def create_data_mask_rule(self, create_data_mask_rule_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1195,7 +1194,7 @@ def create_data_source(self, create_data_source_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_source got unknown kwargs: {extra_kwargs!r}") @@ -1206,7 +1205,7 @@ def create_data_source(self, create_data_source_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1289,7 +1288,7 @@ def create_detector_recipe(self, create_detector_recipe_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1300,7 +1299,7 @@ def create_detector_recipe(self, create_detector_recipe_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1388,7 +1387,7 @@ def create_detector_recipe_detector_rule(self, detector_recipe_id, create_detect "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -1397,10 +1396,10 @@ def create_detector_recipe_detector_rule(self, detector_recipe_id, create_detect "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1409,7 +1408,7 @@ def create_detector_recipe_detector_rule(self, detector_recipe_id, create_detect "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1496,7 +1495,7 @@ def create_managed_list(self, create_managed_list_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_managed_list got unknown kwargs: {extra_kwargs!r}") @@ -1507,7 +1506,7 @@ def create_managed_list(self, create_managed_list_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1592,7 +1591,7 @@ def create_responder_recipe(self, create_responder_recipe_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1603,7 +1602,7 @@ def create_responder_recipe(self, create_responder_recipe_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1688,7 +1687,7 @@ def create_security_recipe(self, create_security_recipe_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1699,7 +1698,7 @@ def create_security_recipe(self, create_security_recipe_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1784,7 +1783,7 @@ def create_security_zone(self, create_security_zone_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_zone got unknown kwargs: {extra_kwargs!r}") @@ -1795,7 +1794,7 @@ def create_security_zone(self, create_security_zone_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1880,7 +1879,7 @@ def create_target(self, create_target_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target got unknown kwargs: {extra_kwargs!r}") @@ -1891,7 +1890,7 @@ def create_target(self, create_target_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1979,7 +1978,7 @@ def create_target_detector_recipe(self, target_id, attach_target_detector_recipe "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1988,10 +1987,10 @@ def create_target_detector_recipe(self, target_id, attach_target_detector_recipe "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2000,7 +1999,7 @@ def create_target_detector_recipe(self, target_id, attach_target_detector_recipe "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2090,7 +2089,7 @@ def create_target_responder_recipe(self, target_id, attach_target_responder_reci "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2099,10 +2098,10 @@ def create_target_responder_recipe(self, target_id, attach_target_responder_reci "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2111,7 +2110,7 @@ def create_target_responder_recipe(self, target_id, attach_target_responder_reci "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2198,7 +2197,7 @@ def delete_data_mask_rule(self, data_mask_rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_mask_rule got unknown kwargs: {extra_kwargs!r}") @@ -2207,10 +2206,10 @@ def delete_data_mask_rule(self, data_mask_rule_id, **kwargs): "dataMaskRuleId": data_mask_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2219,7 +2218,7 @@ def delete_data_mask_rule(self, data_mask_rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2309,7 +2308,7 @@ def delete_data_source(self, data_source_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_source got unknown kwargs: {extra_kwargs!r}") @@ -2318,10 +2317,10 @@ def delete_data_source(self, data_source_id, **kwargs): "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2331,7 +2330,7 @@ def delete_data_source(self, data_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2422,7 +2421,7 @@ def delete_detector_recipe(self, detector_recipe_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2431,10 +2430,10 @@ def delete_detector_recipe(self, detector_recipe_id, **kwargs): "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2444,7 +2443,7 @@ def delete_detector_recipe(self, detector_recipe_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2530,7 +2529,7 @@ def delete_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -2540,10 +2539,10 @@ def delete_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2552,7 +2551,7 @@ def delete_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2640,7 +2639,7 @@ def delete_detector_recipe_detector_rule_data_source(self, detector_recipe_id, d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_detector_recipe_detector_rule_data_source got unknown kwargs: {extra_kwargs!r}") @@ -2651,10 +2650,10 @@ def delete_detector_recipe_detector_rule_data_source(self, detector_recipe_id, d "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2663,7 +2662,7 @@ def delete_detector_recipe_detector_rule_data_source(self, detector_recipe_id, d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2753,7 +2752,7 @@ def delete_managed_list(self, managed_list_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_managed_list got unknown kwargs: {extra_kwargs!r}") @@ -2762,10 +2761,10 @@ def delete_managed_list(self, managed_list_id, **kwargs): "managedListId": managed_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2775,7 +2774,7 @@ def delete_managed_list(self, managed_list_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2858,7 +2857,7 @@ def delete_responder_recipe(self, responder_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2867,10 +2866,10 @@ def delete_responder_recipe(self, responder_recipe_id, **kwargs): "responderRecipeId": responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2879,7 +2878,7 @@ def delete_responder_recipe(self, responder_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2961,7 +2960,7 @@ def delete_security_recipe(self, security_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2970,10 +2969,10 @@ def delete_security_recipe(self, security_recipe_id, **kwargs): "securityRecipeId": security_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2982,7 +2981,7 @@ def delete_security_recipe(self, security_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3064,7 +3063,7 @@ def delete_security_zone(self, security_zone_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_zone got unknown kwargs: {extra_kwargs!r}") @@ -3073,10 +3072,10 @@ def delete_security_zone(self, security_zone_id, **kwargs): "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3085,7 +3084,7 @@ def delete_security_zone(self, security_zone_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3167,7 +3166,7 @@ def delete_target(self, target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target got unknown kwargs: {extra_kwargs!r}") @@ -3176,10 +3175,10 @@ def delete_target(self, target_id, **kwargs): "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3188,7 +3187,7 @@ def delete_target(self, target_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3273,7 +3272,7 @@ def delete_target_detector_recipe(self, target_id, target_detector_recipe_id, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -3283,10 +3282,10 @@ def delete_target_detector_recipe(self, target_id, target_detector_recipe_id, ** "targetDetectorRecipeId": target_detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3295,7 +3294,7 @@ def delete_target_detector_recipe(self, target_id, target_detector_recipe_id, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3380,7 +3379,7 @@ def delete_target_responder_recipe(self, target_id, target_responder_recipe_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -3390,10 +3389,10 @@ def delete_target_responder_recipe(self, target_id, target_responder_recipe_id, "targetResponderRecipeId": target_responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3402,7 +3401,7 @@ def delete_target_responder_recipe(self, target_id, target_responder_recipe_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3499,7 +3498,7 @@ def execute_responder_execution(self, responder_execution_id, compartment_id, ** "opc_retry_token", "execute_responder_execution_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"execute_responder_execution got unknown kwargs: {extra_kwargs!r}") @@ -3508,16 +3507,16 @@ def execute_responder_execution(self, responder_execution_id, compartment_id, ** "responderExecutionId": responder_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3526,7 +3525,7 @@ def execute_responder_execution(self, responder_execution_id, compartment_id, ** "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3615,7 +3614,7 @@ def get_condition_metadata_type(self, condition_metadata_type_id, **kwargs): "service_type", "resource_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_condition_metadata_type got unknown kwargs: {extra_kwargs!r}") @@ -3624,24 +3623,24 @@ def get_condition_metadata_type(self, condition_metadata_type_id, **kwargs): "conditionMetadataTypeId": condition_metadata_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "serviceType": kwargs.get("service_type", missing), "resourceType": kwargs.get("resource_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3719,7 +3718,7 @@ def get_configuration(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3727,14 +3726,14 @@ def get_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3810,7 +3809,7 @@ def get_data_mask_rule(self, data_mask_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_mask_rule got unknown kwargs: {extra_kwargs!r}") @@ -3819,10 +3818,10 @@ def get_data_mask_rule(self, data_mask_rule_id, **kwargs): "dataMaskRuleId": data_mask_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3830,7 +3829,7 @@ def get_data_mask_rule(self, data_mask_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3906,7 +3905,7 @@ def get_data_source(self, data_source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_source got unknown kwargs: {extra_kwargs!r}") @@ -3915,10 +3914,10 @@ def get_data_source(self, data_source_id, **kwargs): "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3926,7 +3925,7 @@ def get_data_source(self, data_source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4002,7 +4001,7 @@ def get_detector(self, detector_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_detector got unknown kwargs: {extra_kwargs!r}") @@ -4011,10 +4010,10 @@ def get_detector(self, detector_id, **kwargs): "detectorId": detector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4022,7 +4021,7 @@ def get_detector(self, detector_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4098,7 +4097,7 @@ def get_detector_recipe(self, detector_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -4107,10 +4106,10 @@ def get_detector_recipe(self, detector_recipe_id, **kwargs): "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4118,7 +4117,7 @@ def get_detector_recipe(self, detector_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4197,7 +4196,7 @@ def get_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -4207,10 +4206,10 @@ def get_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule_id "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4218,7 +4217,7 @@ def get_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4297,7 +4296,7 @@ def get_detector_rule(self, detector_id, detector_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -4307,10 +4306,10 @@ def get_detector_rule(self, detector_id, detector_rule_id, **kwargs): "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4318,7 +4317,7 @@ def get_detector_rule(self, detector_id, detector_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4394,7 +4393,7 @@ def get_managed_list(self, managed_list_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_list got unknown kwargs: {extra_kwargs!r}") @@ -4403,10 +4402,10 @@ def get_managed_list(self, managed_list_id, **kwargs): "managedListId": managed_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4414,7 +4413,7 @@ def get_managed_list(self, managed_list_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4490,7 +4489,7 @@ def get_problem(self, problem_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_problem got unknown kwargs: {extra_kwargs!r}") @@ -4499,10 +4498,10 @@ def get_problem(self, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4510,7 +4509,7 @@ def get_problem(self, problem_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4586,7 +4585,7 @@ def get_resource_profile(self, resource_profile_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resource_profile got unknown kwargs: {extra_kwargs!r}") @@ -4595,10 +4594,10 @@ def get_resource_profile(self, resource_profile_id, **kwargs): "resourceProfileId": resource_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4606,7 +4605,7 @@ def get_resource_profile(self, resource_profile_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4682,7 +4681,7 @@ def get_responder_execution(self, responder_execution_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_responder_execution got unknown kwargs: {extra_kwargs!r}") @@ -4691,10 +4690,10 @@ def get_responder_execution(self, responder_execution_id, **kwargs): "responderExecutionId": responder_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4702,7 +4701,7 @@ def get_responder_execution(self, responder_execution_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4778,7 +4777,7 @@ def get_responder_recipe(self, responder_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -4787,10 +4786,10 @@ def get_responder_recipe(self, responder_recipe_id, **kwargs): "responderRecipeId": responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4798,7 +4797,7 @@ def get_responder_recipe(self, responder_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4877,7 +4876,7 @@ def get_responder_recipe_responder_rule(self, responder_recipe_id, responder_rul "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_responder_recipe_responder_rule got unknown kwargs: {extra_kwargs!r}") @@ -4887,10 +4886,10 @@ def get_responder_recipe_responder_rule(self, responder_recipe_id, responder_rul "responderRuleId": responder_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4898,7 +4897,7 @@ def get_responder_recipe_responder_rule(self, responder_recipe_id, responder_rul "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4974,7 +4973,7 @@ def get_responder_rule(self, responder_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_responder_rule got unknown kwargs: {extra_kwargs!r}") @@ -4983,10 +4982,10 @@ def get_responder_rule(self, responder_rule_id, **kwargs): "responderRuleId": responder_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4994,7 +4993,7 @@ def get_responder_rule(self, responder_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5070,7 +5069,7 @@ def get_security_policy(self, security_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_policy got unknown kwargs: {extra_kwargs!r}") @@ -5079,10 +5078,10 @@ def get_security_policy(self, security_policy_id, **kwargs): "securityPolicyId": security_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5090,7 +5089,7 @@ def get_security_policy(self, security_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5166,7 +5165,7 @@ def get_security_recipe(self, security_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_recipe got unknown kwargs: {extra_kwargs!r}") @@ -5175,10 +5174,10 @@ def get_security_recipe(self, security_recipe_id, **kwargs): "securityRecipeId": security_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5186,7 +5185,7 @@ def get_security_recipe(self, security_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5262,7 +5261,7 @@ def get_security_zone(self, security_zone_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_zone got unknown kwargs: {extra_kwargs!r}") @@ -5271,10 +5270,10 @@ def get_security_zone(self, security_zone_id, **kwargs): "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5282,7 +5281,7 @@ def get_security_zone(self, security_zone_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5358,7 +5357,7 @@ def get_sighting(self, sighting_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sighting got unknown kwargs: {extra_kwargs!r}") @@ -5367,10 +5366,10 @@ def get_sighting(self, sighting_id, **kwargs): "sightingId": sighting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5378,7 +5377,7 @@ def get_sighting(self, sighting_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5454,7 +5453,7 @@ def get_target(self, target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target got unknown kwargs: {extra_kwargs!r}") @@ -5463,10 +5462,10 @@ def get_target(self, target_id, **kwargs): "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5474,7 +5473,7 @@ def get_target(self, target_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5553,7 +5552,7 @@ def get_target_detector_recipe(self, target_id, target_detector_recipe_id, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -5563,10 +5562,10 @@ def get_target_detector_recipe(self, target_id, target_detector_recipe_id, **kwa "targetDetectorRecipeId": target_detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5574,7 +5573,7 @@ def get_target_detector_recipe(self, target_id, target_detector_recipe_id, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5656,7 +5655,7 @@ def get_target_detector_recipe_detector_rule(self, target_id, target_detector_re "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -5667,10 +5666,10 @@ def get_target_detector_recipe_detector_rule(self, target_id, target_detector_re "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5678,7 +5677,7 @@ def get_target_detector_recipe_detector_rule(self, target_id, target_detector_re "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5757,7 +5756,7 @@ def get_target_responder_recipe(self, target_id, target_responder_recipe_id, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -5767,10 +5766,10 @@ def get_target_responder_recipe(self, target_id, target_responder_recipe_id, **k "targetResponderRecipeId": target_responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5778,7 +5777,7 @@ def get_target_responder_recipe(self, target_id, target_responder_recipe_id, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5860,7 +5859,7 @@ def get_target_responder_recipe_responder_rule(self, target_id, target_responder "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_responder_recipe_responder_rule got unknown kwargs: {extra_kwargs!r}") @@ -5871,10 +5870,10 @@ def get_target_responder_recipe_responder_rule(self, target_id, target_responder "responderRuleId": responder_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5882,7 +5881,7 @@ def get_target_responder_recipe_responder_rule(self, target_id, target_responder "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5958,7 +5957,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -5967,10 +5966,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5978,7 +5977,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6080,7 +6079,7 @@ def list_condition_metadata_types(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_condition_metadata_types got unknown kwargs: {extra_kwargs!r}") @@ -6114,14 +6113,14 @@ def list_condition_metadata_types(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6255,7 +6254,7 @@ def list_data_mask_rules(self, compartment_id, **kwargs): "iam_group_id", "target_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_mask_rules got unknown kwargs: {extra_kwargs!r}") @@ -6309,14 +6308,14 @@ def list_data_mask_rules(self, compartment_id, **kwargs): "iamGroupId": kwargs.get("iam_group_id", missing), "targetType": kwargs.get("target_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6416,7 +6415,7 @@ def list_data_source_events(self, data_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_source_events got unknown kwargs: {extra_kwargs!r}") @@ -6425,10 +6424,10 @@ def list_data_source_events(self, data_source_id, **kwargs): "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6452,14 +6451,14 @@ def list_data_source_events(self, data_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6610,7 +6609,7 @@ def list_data_sources(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_sources got unknown kwargs: {extra_kwargs!r}") @@ -6670,14 +6669,14 @@ def list_data_sources(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6786,7 +6785,7 @@ def list_detector_recipe_detector_rules(self, detector_recipe_id, compartment_id "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_detector_recipe_detector_rules got unknown kwargs: {extra_kwargs!r}") @@ -6795,10 +6794,10 @@ def list_detector_recipe_detector_rules(self, detector_recipe_id, compartment_id "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -6831,14 +6830,14 @@ def list_detector_recipe_detector_rules(self, detector_recipe_id, compartment_id "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6983,7 +6982,7 @@ def list_detector_recipes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_detector_recipes got unknown kwargs: {extra_kwargs!r}") @@ -7028,14 +7027,14 @@ def list_detector_recipes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7144,7 +7143,7 @@ def list_detector_rules(self, detector_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_detector_rules got unknown kwargs: {extra_kwargs!r}") @@ -7153,10 +7152,10 @@ def list_detector_rules(self, detector_id, compartment_id, **kwargs): "detectorId": detector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -7189,14 +7188,14 @@ def list_detector_rules(self, detector_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7300,7 +7299,7 @@ def list_detectors(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_detectors got unknown kwargs: {extra_kwargs!r}") @@ -7334,14 +7333,14 @@ def list_detectors(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7437,7 +7436,7 @@ def list_impacted_resources(self, problem_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_impacted_resources got unknown kwargs: {extra_kwargs!r}") @@ -7446,10 +7445,10 @@ def list_impacted_resources(self, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7472,14 +7471,14 @@ def list_impacted_resources(self, problem_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7583,7 +7582,7 @@ def list_managed_list_types(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_list_types got unknown kwargs: {extra_kwargs!r}") @@ -7617,14 +7616,14 @@ def list_managed_list_types(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7772,7 +7771,7 @@ def list_managed_lists(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_lists got unknown kwargs: {extra_kwargs!r}") @@ -7825,14 +7824,14 @@ def list_managed_lists(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7928,7 +7927,7 @@ def list_policies(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_policies got unknown kwargs: {extra_kwargs!r}") @@ -7954,14 +7953,14 @@ def list_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8057,7 +8056,7 @@ def list_problem_endpoints(self, problem_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_problem_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -8066,10 +8065,10 @@ def list_problem_endpoints(self, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8092,14 +8091,14 @@ def list_problem_endpoints(self, problem_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8197,7 +8196,7 @@ def list_problem_entities(self, problem_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_problem_entities got unknown kwargs: {extra_kwargs!r}") @@ -8206,10 +8205,10 @@ def list_problem_entities(self, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8232,14 +8231,14 @@ def list_problem_entities(self, problem_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8340,7 +8339,7 @@ def list_problem_histories(self, compartment_id, problem_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_problem_histories got unknown kwargs: {extra_kwargs!r}") @@ -8349,10 +8348,10 @@ def list_problem_histories(self, compartment_id, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8376,14 +8375,14 @@ def list_problem_histories(self, compartment_id, problem_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8592,7 +8591,7 @@ def list_problems(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_problems got unknown kwargs: {extra_kwargs!r}") @@ -8673,14 +8672,14 @@ def list_problems(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8809,7 +8808,7 @@ def list_recommendations(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -8861,14 +8860,14 @@ def list_recommendations(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8964,7 +8963,7 @@ def list_resource_profile_endpoints(self, resource_profile_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_profile_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -8973,10 +8972,10 @@ def list_resource_profile_endpoints(self, resource_profile_id, **kwargs): "resourceProfileId": resource_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8999,14 +8998,14 @@ def list_resource_profile_endpoints(self, resource_profile_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9104,7 +9103,7 @@ def list_resource_profile_impacted_resources(self, resource_profile_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_profile_impacted_resources got unknown kwargs: {extra_kwargs!r}") @@ -9113,10 +9112,10 @@ def list_resource_profile_impacted_resources(self, resource_profile_id, **kwargs "resourceProfileId": resource_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -9139,14 +9138,14 @@ def list_resource_profile_impacted_resources(self, resource_profile_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9310,7 +9309,7 @@ def list_resource_profiles(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_profiles got unknown kwargs: {extra_kwargs!r}") @@ -9354,14 +9353,14 @@ def list_resource_profiles(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9469,7 +9468,7 @@ def list_resource_types(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -9511,14 +9510,14 @@ def list_resource_types(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9614,7 +9613,7 @@ def list_responder_activities(self, problem_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_responder_activities got unknown kwargs: {extra_kwargs!r}") @@ -9623,10 +9622,10 @@ def list_responder_activities(self, problem_id, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -9649,14 +9648,14 @@ def list_responder_activities(self, problem_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9817,7 +9816,7 @@ def list_responder_executions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_responder_executions got unknown kwargs: {extra_kwargs!r}") @@ -9883,14 +9882,14 @@ def list_responder_executions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9999,7 +9998,7 @@ def list_responder_recipe_responder_rules(self, responder_recipe_id, compartment "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_responder_recipe_responder_rules got unknown kwargs: {extra_kwargs!r}") @@ -10008,10 +10007,10 @@ def list_responder_recipe_responder_rules(self, responder_recipe_id, compartment "responderRecipeId": responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -10044,14 +10043,14 @@ def list_responder_recipe_responder_rules(self, responder_recipe_id, compartment "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10195,7 +10194,7 @@ def list_responder_recipes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_responder_recipes got unknown kwargs: {extra_kwargs!r}") @@ -10240,14 +10239,14 @@ def list_responder_recipes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10353,7 +10352,7 @@ def list_responder_rules(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_responder_rules got unknown kwargs: {extra_kwargs!r}") @@ -10388,14 +10387,14 @@ def list_responder_rules(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10505,7 +10504,7 @@ def list_security_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_policies got unknown kwargs: {extra_kwargs!r}") @@ -10541,14 +10540,14 @@ def list_security_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10658,7 +10657,7 @@ def list_security_recipes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_recipes got unknown kwargs: {extra_kwargs!r}") @@ -10694,14 +10693,14 @@ def list_security_recipes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10819,7 +10818,7 @@ def list_security_zones(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_zones got unknown kwargs: {extra_kwargs!r}") @@ -10857,14 +10856,14 @@ def list_security_zones(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10960,7 +10959,7 @@ def list_sighting_endpoints(self, sighting_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sighting_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -10969,10 +10968,10 @@ def list_sighting_endpoints(self, sighting_id, **kwargs): "sightingId": sighting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10995,14 +10994,14 @@ def list_sighting_endpoints(self, sighting_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11100,7 +11099,7 @@ def list_sighting_impacted_resources(self, sighting_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sighting_impacted_resources got unknown kwargs: {extra_kwargs!r}") @@ -11109,10 +11108,10 @@ def list_sighting_impacted_resources(self, sighting_id, **kwargs): "sightingId": sighting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -11135,14 +11134,14 @@ def list_sighting_impacted_resources(self, sighting_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11285,7 +11284,7 @@ def list_sightings(self, compartment_id, **kwargs): "time_last_detected_less_than_or_equal_to", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sightings got unknown kwargs: {extra_kwargs!r}") @@ -11324,14 +11323,14 @@ def list_sightings(self, compartment_id, **kwargs): "timeLastDetectedGreaterThanOrEqualTo": kwargs.get("time_last_detected_greater_than_or_equal_to", missing), "timeLastDetectedLessThanOrEqualTo": kwargs.get("time_last_detected_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11433,7 +11432,7 @@ def list_tactics(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tactics got unknown kwargs: {extra_kwargs!r}") @@ -11467,14 +11466,14 @@ def list_tactics(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11586,7 +11585,7 @@ def list_target_detector_recipe_detector_rules(self, target_id, target_detector_ "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_detector_recipe_detector_rules got unknown kwargs: {extra_kwargs!r}") @@ -11596,10 +11595,10 @@ def list_target_detector_recipe_detector_rules(self, target_id, target_detector_ "targetDetectorRecipeId": target_detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11632,14 +11631,14 @@ def list_target_detector_recipe_detector_rules(self, target_id, target_detector_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11750,7 +11749,7 @@ def list_target_detector_recipes(self, target_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_detector_recipes got unknown kwargs: {extra_kwargs!r}") @@ -11759,10 +11758,10 @@ def list_target_detector_recipes(self, target_id, compartment_id, **kwargs): "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11795,14 +11794,14 @@ def list_target_detector_recipes(self, target_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11916,7 +11915,7 @@ def list_target_responder_recipe_responder_rules(self, target_id, target_respond "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_responder_recipe_responder_rules got unknown kwargs: {extra_kwargs!r}") @@ -11926,10 +11925,10 @@ def list_target_responder_recipe_responder_rules(self, target_id, target_respond "targetResponderRecipeId": target_responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11962,14 +11961,14 @@ def list_target_responder_recipe_responder_rules(self, target_id, target_respond "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12080,7 +12079,7 @@ def list_target_responder_recipes(self, target_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_responder_recipes got unknown kwargs: {extra_kwargs!r}") @@ -12089,10 +12088,10 @@ def list_target_responder_recipes(self, target_id, compartment_id, **kwargs): "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12125,14 +12124,14 @@ def list_target_responder_recipes(self, target_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12276,7 +12275,7 @@ def list_targets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_targets got unknown kwargs: {extra_kwargs!r}") @@ -12321,14 +12320,14 @@ def list_targets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12434,7 +12433,7 @@ def list_techniques(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_techniques got unknown kwargs: {extra_kwargs!r}") @@ -12469,14 +12468,14 @@ def list_techniques(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12572,7 +12571,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -12581,10 +12580,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -12607,14 +12606,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12712,7 +12711,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -12721,10 +12720,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -12747,14 +12746,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12862,7 +12861,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -12897,14 +12896,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12999,7 +12998,7 @@ def remove_compartment(self, security_zone_id, remove_compartment_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_compartment got unknown kwargs: {extra_kwargs!r}") @@ -13008,10 +13007,10 @@ def remove_compartment(self, security_zone_id, remove_compartment_details, **kwa "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13021,7 +13020,7 @@ def remove_compartment(self, security_zone_id, remove_compartment_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13108,7 +13107,7 @@ def request_risk_scores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_risk_scores got unknown kwargs: {extra_kwargs!r}") @@ -13118,14 +13117,14 @@ def request_risk_scores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13218,7 +13217,7 @@ def request_security_score_summarized_trend(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_security_score_summarized_trend got unknown kwargs: {extra_kwargs!r}") @@ -13230,14 +13229,14 @@ def request_security_score_summarized_trend(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13321,7 +13320,7 @@ def request_security_scores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_security_scores got unknown kwargs: {extra_kwargs!r}") @@ -13331,14 +13330,14 @@ def request_security_scores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13459,7 +13458,7 @@ def request_summarized_activity_problems(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_activity_problems got unknown kwargs: {extra_kwargs!r}") @@ -13479,14 +13478,14 @@ def request_summarized_activity_problems(self, compartment_id, **kwargs): "includeUnknownLocations": kwargs.get("include_unknown_locations", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13603,7 +13602,7 @@ def request_summarized_problems(self, list_dimensions, compartment_id, **kwargs) "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_problems got unknown kwargs: {extra_kwargs!r}") @@ -13630,14 +13629,14 @@ def request_summarized_problems(self, list_dimensions, compartment_id, **kwargs) "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13768,7 +13767,7 @@ def request_summarized_responder_executions(self, responder_executions_dimension "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_responder_executions got unknown kwargs: {extra_kwargs!r}") @@ -13813,14 +13812,14 @@ def request_summarized_responder_executions(self, responder_executions_dimension "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13904,7 +13903,7 @@ def request_summarized_risk_scores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_risk_scores got unknown kwargs: {extra_kwargs!r}") @@ -13914,14 +13913,14 @@ def request_summarized_risk_scores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14005,7 +14004,7 @@ def request_summarized_security_scores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_security_scores got unknown kwargs: {extra_kwargs!r}") @@ -14015,14 +14014,14 @@ def request_summarized_security_scores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14141,7 +14140,7 @@ def request_summarized_top_trend_resource_profile_risk_scores(self, compartment_ "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_top_trend_resource_profile_risk_scores got unknown kwargs: {extra_kwargs!r}") @@ -14171,14 +14170,14 @@ def request_summarized_top_trend_resource_profile_risk_scores(self, compartment_ "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14298,7 +14297,7 @@ def request_summarized_trend_problems(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_trend_problems got unknown kwargs: {extra_kwargs!r}") @@ -14319,14 +14318,14 @@ def request_summarized_trend_problems(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14438,7 +14437,7 @@ def request_summarized_trend_resource_risk_scores(self, request_summarized_trend "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_trend_resource_risk_scores got unknown kwargs: {extra_kwargs!r}") @@ -14459,14 +14458,14 @@ def request_summarized_trend_resource_risk_scores(self, request_summarized_trend "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14588,7 +14587,7 @@ def request_summarized_trend_responder_executions(self, compartment_id, **kwargs "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_trend_responder_executions got unknown kwargs: {extra_kwargs!r}") @@ -14609,14 +14608,14 @@ def request_summarized_trend_responder_executions(self, compartment_id, **kwargs "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14708,7 +14707,7 @@ def request_summarized_trend_security_scores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_trend_security_scores got unknown kwargs: {extra_kwargs!r}") @@ -14720,14 +14719,14 @@ def request_summarized_trend_security_scores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14804,7 +14803,7 @@ def skip_bulk_responder_execution(self, skip_bulk_responder_execution_details, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"skip_bulk_responder_execution got unknown kwargs: {extra_kwargs!r}") @@ -14814,7 +14813,7 @@ def skip_bulk_responder_execution(self, skip_bulk_responder_execution_details, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14907,7 +14906,7 @@ def skip_responder_execution(self, responder_execution_id, compartment_id, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"skip_responder_execution got unknown kwargs: {extra_kwargs!r}") @@ -14916,16 +14915,16 @@ def skip_responder_execution(self, responder_execution_id, compartment_id, **kwa "responderExecutionId": responder_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -14934,7 +14933,7 @@ def skip_responder_execution(self, responder_execution_id, compartment_id, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15030,7 +15029,7 @@ def trigger_responder(self, problem_id, trigger_responder_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"trigger_responder got unknown kwargs: {extra_kwargs!r}") @@ -15039,10 +15038,10 @@ def trigger_responder(self, problem_id, trigger_responder_details, **kwargs): "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15052,7 +15051,7 @@ def trigger_responder(self, problem_id, trigger_responder_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15129,7 +15128,7 @@ def update_bulk_problem_status(self, update_bulk_problem_status_details, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_bulk_problem_status got unknown kwargs: {extra_kwargs!r}") @@ -15139,7 +15138,7 @@ def update_bulk_problem_status(self, update_bulk_problem_status_details, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15232,7 +15231,7 @@ def update_configuration(self, update_configuration_details, compartment_id, **k "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration got unknown kwargs: {extra_kwargs!r}") @@ -15240,7 +15239,7 @@ def update_configuration(self, update_configuration_details, compartment_id, **k query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15249,7 +15248,7 @@ def update_configuration(self, update_configuration_details, compartment_id, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15339,7 +15338,7 @@ def update_data_mask_rule(self, data_mask_rule_id, update_data_mask_rule_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_mask_rule got unknown kwargs: {extra_kwargs!r}") @@ -15348,10 +15347,10 @@ def update_data_mask_rule(self, data_mask_rule_id, update_data_mask_rule_details "dataMaskRuleId": data_mask_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15360,7 +15359,7 @@ def update_data_mask_rule(self, data_mask_rule_id, update_data_mask_rule_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15457,7 +15456,7 @@ def update_data_source(self, data_source_id, update_data_source_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_source got unknown kwargs: {extra_kwargs!r}") @@ -15466,10 +15465,10 @@ def update_data_source(self, data_source_id, update_data_source_details, **kwarg "dataSourceId": data_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15479,7 +15478,7 @@ def update_data_source(self, data_source_id, update_data_source_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15575,7 +15574,7 @@ def update_detector_recipe(self, detector_recipe_id, update_detector_recipe_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -15584,10 +15583,10 @@ def update_detector_recipe(self, detector_recipe_id, update_detector_recipe_deta "detectorRecipeId": detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15597,7 +15596,7 @@ def update_detector_recipe(self, detector_recipe_id, update_detector_recipe_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15690,7 +15689,7 @@ def update_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -15700,10 +15699,10 @@ def update_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15712,7 +15711,7 @@ def update_detector_recipe_detector_rule(self, detector_recipe_id, detector_rule "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15809,7 +15808,7 @@ def update_managed_list(self, managed_list_id, update_managed_list_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_list got unknown kwargs: {extra_kwargs!r}") @@ -15818,10 +15817,10 @@ def update_managed_list(self, managed_list_id, update_managed_list_details, **kw "managedListId": managed_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15831,7 +15830,7 @@ def update_managed_list(self, managed_list_id, update_managed_list_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15929,7 +15928,7 @@ def update_problem_status(self, problem_id, update_problem_status_details, **kwa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_problem_status got unknown kwargs: {extra_kwargs!r}") @@ -15938,10 +15937,10 @@ def update_problem_status(self, problem_id, update_problem_status_details, **kwa "problemId": problem_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15951,7 +15950,7 @@ def update_problem_status(self, problem_id, update_problem_status_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16041,7 +16040,7 @@ def update_responder_recipe(self, responder_recipe_id, update_responder_recipe_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -16050,10 +16049,10 @@ def update_responder_recipe(self, responder_recipe_id, update_responder_recipe_d "responderRecipeId": responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16062,7 +16061,7 @@ def update_responder_recipe(self, responder_recipe_id, update_responder_recipe_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16154,7 +16153,7 @@ def update_responder_recipe_responder_rule(self, responder_recipe_id, responder_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_responder_recipe_responder_rule got unknown kwargs: {extra_kwargs!r}") @@ -16164,10 +16163,10 @@ def update_responder_recipe_responder_rule(self, responder_recipe_id, responder_ "responderRuleId": responder_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16176,7 +16175,7 @@ def update_responder_recipe_responder_rule(self, responder_recipe_id, responder_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16265,7 +16264,7 @@ def update_security_recipe(self, security_recipe_id, update_security_recipe_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_recipe got unknown kwargs: {extra_kwargs!r}") @@ -16274,10 +16273,10 @@ def update_security_recipe(self, security_recipe_id, update_security_recipe_deta "securityRecipeId": security_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16286,7 +16285,7 @@ def update_security_recipe(self, security_recipe_id, update_security_recipe_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16375,7 +16374,7 @@ def update_security_zone(self, security_zone_id, update_security_zone_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_zone got unknown kwargs: {extra_kwargs!r}") @@ -16384,10 +16383,10 @@ def update_security_zone(self, security_zone_id, update_security_zone_details, * "securityZoneId": security_zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16396,7 +16395,7 @@ def update_security_zone(self, security_zone_id, update_security_zone_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16485,7 +16484,7 @@ def update_target(self, target_id, update_target_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target got unknown kwargs: {extra_kwargs!r}") @@ -16494,10 +16493,10 @@ def update_target(self, target_id, update_target_details, **kwargs): "targetId": target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16506,7 +16505,7 @@ def update_target(self, target_id, update_target_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16598,7 +16597,7 @@ def update_target_detector_recipe(self, target_id, target_detector_recipe_id, up "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_detector_recipe got unknown kwargs: {extra_kwargs!r}") @@ -16608,10 +16607,10 @@ def update_target_detector_recipe(self, target_id, target_detector_recipe_id, up "targetDetectorRecipeId": target_detector_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16620,7 +16619,7 @@ def update_target_detector_recipe(self, target_id, target_detector_recipe_id, up "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16715,7 +16714,7 @@ def update_target_detector_recipe_detector_rule(self, target_id, target_detector "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_detector_recipe_detector_rule got unknown kwargs: {extra_kwargs!r}") @@ -16726,10 +16725,10 @@ def update_target_detector_recipe_detector_rule(self, target_id, target_detector "detectorRuleId": detector_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16738,7 +16737,7 @@ def update_target_detector_recipe_detector_rule(self, target_id, target_detector "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16830,7 +16829,7 @@ def update_target_responder_recipe(self, target_id, target_responder_recipe_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_responder_recipe got unknown kwargs: {extra_kwargs!r}") @@ -16840,10 +16839,10 @@ def update_target_responder_recipe(self, target_id, target_responder_recipe_id, "targetResponderRecipeId": target_responder_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16852,7 +16851,7 @@ def update_target_responder_recipe(self, target_id, target_responder_recipe_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16947,7 +16946,7 @@ def update_target_responder_recipe_responder_rule(self, target_id, target_respon "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_responder_recipe_responder_rule got unknown kwargs: {extra_kwargs!r}") @@ -16958,10 +16957,10 @@ def update_target_responder_recipe_responder_rule(self, target_id, target_respon "responderRuleId": responder_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16970,7 +16969,7 @@ def update_target_responder_recipe_responder_rule(self, target_id, target_respon "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/cloud_migrations/migration_client.py b/src/oci/cloud_migrations/migration_client.py index dd17184796..5b93e289bf 100644 --- a/src/oci/cloud_migrations/migration_client.py +++ b/src/oci/cloud_migrations/migration_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -176,10 +175,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -188,7 +187,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -283,7 +282,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_migration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -292,10 +291,10 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -305,7 +304,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -403,7 +402,7 @@ def change_migration_plan_compartment(self, migration_plan_id, change_migration_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_migration_plan_compartment got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,10 @@ def change_migration_plan_compartment(self, migration_plan_id, change_migration_ "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -425,7 +424,7 @@ def change_migration_plan_compartment(self, migration_plan_id, change_migration_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -523,7 +522,7 @@ def change_replication_schedule_compartment(self, replication_schedule_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_replication_schedule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -532,10 +531,10 @@ def change_replication_schedule_compartment(self, replication_schedule_id, chang "replicationScheduleId": replication_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -545,7 +544,7 @@ def change_replication_schedule_compartment(self, replication_schedule_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -632,7 +631,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_migration got unknown kwargs: {extra_kwargs!r}") @@ -643,7 +642,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -730,7 +729,7 @@ def create_migration_asset(self, create_migration_asset_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_migration_asset got unknown kwargs: {extra_kwargs!r}") @@ -741,7 +740,7 @@ def create_migration_asset(self, create_migration_asset_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -828,7 +827,7 @@ def create_migration_plan(self, create_migration_plan_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -839,7 +838,7 @@ def create_migration_plan(self, create_migration_plan_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -926,7 +925,7 @@ def create_replication_schedule(self, create_replication_schedule_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_replication_schedule got unknown kwargs: {extra_kwargs!r}") @@ -937,7 +936,7 @@ def create_replication_schedule(self, create_replication_schedule_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1024,7 +1023,7 @@ def create_target_asset(self, create_target_asset_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target_asset got unknown kwargs: {extra_kwargs!r}") @@ -1035,7 +1034,7 @@ def create_target_asset(self, create_target_asset_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1122,7 +1121,7 @@ def delete_migration(self, migration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_migration got unknown kwargs: {extra_kwargs!r}") @@ -1131,10 +1130,10 @@ def delete_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1143,7 +1142,7 @@ def delete_migration(self, migration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1227,7 +1226,7 @@ def delete_migration_asset(self, migration_asset_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_migration_asset got unknown kwargs: {extra_kwargs!r}") @@ -1236,10 +1235,10 @@ def delete_migration_asset(self, migration_asset_id, **kwargs): "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1248,7 +1247,7 @@ def delete_migration_asset(self, migration_asset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1332,7 +1331,7 @@ def delete_migration_plan(self, migration_plan_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -1341,10 +1340,10 @@ def delete_migration_plan(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1353,7 +1352,7 @@ def delete_migration_plan(self, migration_plan_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1437,7 +1436,7 @@ def delete_replication_schedule(self, replication_schedule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replication_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1446,10 +1445,10 @@ def delete_replication_schedule(self, replication_schedule_id, **kwargs): "replicationScheduleId": replication_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1458,7 +1457,7 @@ def delete_replication_schedule(self, replication_schedule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1542,7 +1541,7 @@ def delete_target_asset(self, target_asset_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target_asset got unknown kwargs: {extra_kwargs!r}") @@ -1551,10 +1550,10 @@ def delete_target_asset(self, target_asset_id, **kwargs): "targetAssetId": target_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1563,7 +1562,7 @@ def delete_target_asset(self, target_asset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1655,7 +1654,7 @@ def execute_migration_plan(self, migration_plan_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"execute_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -1664,10 +1663,10 @@ def execute_migration_plan(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1677,7 +1676,7 @@ def execute_migration_plan(self, migration_plan_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1754,7 +1753,7 @@ def export_migration_plan(self, migration_plan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -1763,10 +1762,10 @@ def export_migration_plan(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1774,7 +1773,7 @@ def export_migration_plan(self, migration_plan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1852,7 +1851,7 @@ def get_migration(self, migration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_migration got unknown kwargs: {extra_kwargs!r}") @@ -1861,10 +1860,10 @@ def get_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1872,7 +1871,7 @@ def get_migration(self, migration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1950,7 +1949,7 @@ def get_migration_asset(self, migration_asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_migration_asset got unknown kwargs: {extra_kwargs!r}") @@ -1959,10 +1958,10 @@ def get_migration_asset(self, migration_asset_id, **kwargs): "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1970,7 +1969,7 @@ def get_migration_asset(self, migration_asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2048,7 +2047,7 @@ def get_migration_plan(self, migration_plan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -2057,10 +2056,10 @@ def get_migration_plan(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2068,7 +2067,7 @@ def get_migration_plan(self, migration_plan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2146,7 +2145,7 @@ def get_replication_progress(self, migration_asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication_progress got unknown kwargs: {extra_kwargs!r}") @@ -2155,10 +2154,10 @@ def get_replication_progress(self, migration_asset_id, **kwargs): "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2166,7 +2165,7 @@ def get_replication_progress(self, migration_asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2244,7 +2243,7 @@ def get_replication_schedule(self, replication_schedule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication_schedule got unknown kwargs: {extra_kwargs!r}") @@ -2253,10 +2252,10 @@ def get_replication_schedule(self, replication_schedule_id, **kwargs): "replicationScheduleId": replication_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2264,7 +2263,7 @@ def get_replication_schedule(self, replication_schedule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2342,7 +2341,7 @@ def get_target_asset(self, target_asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_asset got unknown kwargs: {extra_kwargs!r}") @@ -2351,10 +2350,10 @@ def get_target_asset(self, target_asset_id, **kwargs): "targetAssetId": target_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2362,7 +2361,7 @@ def get_target_asset(self, target_asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2440,7 +2439,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2449,10 +2448,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2460,7 +2459,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2565,7 +2564,7 @@ def import_migration_plan(self, migration_plan_id, import_migration_plan_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -2574,10 +2573,10 @@ def import_migration_plan(self, migration_plan_id, import_migration_plan_details "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2586,7 +2585,7 @@ def import_migration_plan(self, migration_plan_id, import_migration_plan_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -2595,7 +2594,7 @@ def import_migration_plan(self, migration_plan_id, import_migration_plan_details import_migration_plan_details = kwargs.get("import_migration_plan_details", missing) if import_migration_plan_details is not missing and import_migration_plan_details is not None: - if (not isinstance(import_migration_plan_details, (six.binary_type, six.string_types)) and + if (not isinstance(import_migration_plan_details, (bytes, str)) and not hasattr(import_migration_plan_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2722,7 +2721,7 @@ def list_available_shapes(self, migration_plan_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_shapes got unknown kwargs: {extra_kwargs!r}") @@ -2731,10 +2730,10 @@ def list_available_shapes(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2761,14 +2760,14 @@ def list_available_shapes(self, migration_plan_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2883,7 +2882,7 @@ def list_migration_assets(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migration_assets got unknown kwargs: {extra_kwargs!r}") @@ -2919,14 +2918,14 @@ def list_migration_assets(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3043,7 +3042,7 @@ def list_migration_plans(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migration_plans got unknown kwargs: {extra_kwargs!r}") @@ -3080,14 +3079,14 @@ def list_migration_plans(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3200,7 +3199,7 @@ def list_migrations(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migrations got unknown kwargs: {extra_kwargs!r}") @@ -3236,14 +3235,14 @@ def list_migrations(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3356,7 +3355,7 @@ def list_replication_schedules(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replication_schedules got unknown kwargs: {extra_kwargs!r}") @@ -3392,14 +3391,14 @@ def list_replication_schedules(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3512,7 +3511,7 @@ def list_target_assets(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_assets got unknown kwargs: {extra_kwargs!r}") @@ -3548,14 +3547,14 @@ def list_target_assets(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3653,7 +3652,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3662,10 +3661,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3688,14 +3687,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3795,7 +3794,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3804,10 +3803,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3830,14 +3829,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3958,7 +3957,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4002,14 +4001,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4103,7 +4102,7 @@ def refresh_migration(self, migration_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_migration got unknown kwargs: {extra_kwargs!r}") @@ -4112,10 +4111,10 @@ def refresh_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4125,7 +4124,7 @@ def refresh_migration(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4218,7 +4217,7 @@ def refresh_migration_asset(self, migration_asset_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_migration_asset got unknown kwargs: {extra_kwargs!r}") @@ -4227,10 +4226,10 @@ def refresh_migration_asset(self, migration_asset_id, **kwargs): "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4240,7 +4239,7 @@ def refresh_migration_asset(self, migration_asset_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4333,7 +4332,7 @@ def refresh_migration_plan(self, migration_plan_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -4342,10 +4341,10 @@ def refresh_migration_plan(self, migration_plan_id, **kwargs): "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4355,7 +4354,7 @@ def refresh_migration_plan(self, migration_plan_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4448,7 +4447,7 @@ def start_asset_replication(self, migration_asset_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_asset_replication got unknown kwargs: {extra_kwargs!r}") @@ -4457,10 +4456,10 @@ def start_asset_replication(self, migration_asset_id, **kwargs): "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4470,7 +4469,7 @@ def start_asset_replication(self, migration_asset_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4563,7 +4562,7 @@ def start_migration_replication(self, migration_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_migration_replication got unknown kwargs: {extra_kwargs!r}") @@ -4572,10 +4571,10 @@ def start_migration_replication(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4585,7 +4584,7 @@ def start_migration_replication(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4673,7 +4672,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_migration got unknown kwargs: {extra_kwargs!r}") @@ -4682,10 +4681,10 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4694,7 +4693,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4785,7 +4784,7 @@ def update_migration_asset(self, migration_asset_id, update_migration_asset_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_migration_asset got unknown kwargs: {extra_kwargs!r}") @@ -4794,10 +4793,10 @@ def update_migration_asset(self, migration_asset_id, update_migration_asset_deta "migrationAssetId": migration_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4806,7 +4805,7 @@ def update_migration_asset(self, migration_asset_id, update_migration_asset_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4905,7 +4904,7 @@ def update_migration_plan(self, migration_plan_id, update_migration_plan_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_migration_plan got unknown kwargs: {extra_kwargs!r}") @@ -4914,10 +4913,10 @@ def update_migration_plan(self, migration_plan_id, update_migration_plan_details "migrationPlanId": migration_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4927,7 +4926,7 @@ def update_migration_plan(self, migration_plan_id, update_migration_plan_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5025,7 +5024,7 @@ def update_replication_schedule(self, replication_schedule_id, update_replicatio "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_replication_schedule got unknown kwargs: {extra_kwargs!r}") @@ -5034,10 +5033,10 @@ def update_replication_schedule(self, replication_schedule_id, update_replicatio "replicationScheduleId": replication_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5047,7 +5046,7 @@ def update_replication_schedule(self, replication_schedule_id, update_replicatio "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5145,7 +5144,7 @@ def update_target_asset(self, target_asset_id, update_target_asset_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_asset got unknown kwargs: {extra_kwargs!r}") @@ -5154,10 +5153,10 @@ def update_target_asset(self, target_asset_id, update_target_asset_details, **kw "targetAssetId": target_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5167,7 +5166,7 @@ def update_target_asset(self, target_asset_id, update_target_asset_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/compute_cloud_at_customer/compute_cloud_at_customer_client.py b/src/oci/compute_cloud_at_customer/compute_cloud_at_customer_client.py index dd8ecb15a7..16196f6f48 100644 --- a/src/oci/compute_cloud_at_customer/compute_cloud_at_customer_client.py +++ b/src/oci/compute_cloud_at_customer/compute_cloud_at_customer_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -186,7 +185,7 @@ def change_ccc_infrastructure_compartment(self, ccc_infrastructure_id, change_cc "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ccc_infrastructure_compartment got unknown kwargs: {extra_kwargs!r}") @@ -195,10 +194,10 @@ def change_ccc_infrastructure_compartment(self, ccc_infrastructure_id, change_cc "cccInfrastructureId": ccc_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -208,7 +207,7 @@ def change_ccc_infrastructure_compartment(self, ccc_infrastructure_id, change_cc "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -317,7 +316,7 @@ def change_ccc_upgrade_schedule_compartment(self, ccc_upgrade_schedule_id, chang "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ccc_upgrade_schedule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -326,10 +325,10 @@ def change_ccc_upgrade_schedule_compartment(self, ccc_upgrade_schedule_id, chang "cccUpgradeScheduleId": ccc_upgrade_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -339,7 +338,7 @@ def change_ccc_upgrade_schedule_compartment(self, ccc_upgrade_schedule_id, chang "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -429,7 +428,7 @@ def create_ccc_infrastructure(self, create_ccc_infrastructure_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ccc_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -440,7 +439,7 @@ def create_ccc_infrastructure(self, create_ccc_infrastructure_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -529,7 +528,7 @@ def create_ccc_upgrade_schedule(self, create_ccc_upgrade_schedule_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ccc_upgrade_schedule got unknown kwargs: {extra_kwargs!r}") @@ -540,7 +539,7 @@ def create_ccc_upgrade_schedule(self, create_ccc_upgrade_schedule_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -635,7 +634,7 @@ def delete_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ccc_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -644,10 +643,10 @@ def delete_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "cccInfrastructureId": ccc_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -656,7 +655,7 @@ def delete_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -746,7 +745,7 @@ def delete_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ccc_upgrade_schedule got unknown kwargs: {extra_kwargs!r}") @@ -755,10 +754,10 @@ def delete_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "cccUpgradeScheduleId": ccc_upgrade_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -767,7 +766,7 @@ def delete_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -849,7 +848,7 @@ def get_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ccc_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -858,10 +857,10 @@ def get_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "cccInfrastructureId": ccc_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -869,7 +868,7 @@ def get_ccc_infrastructure(self, ccc_infrastructure_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -955,7 +954,7 @@ def get_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ccc_upgrade_schedule got unknown kwargs: {extra_kwargs!r}") @@ -964,10 +963,10 @@ def get_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "cccUpgradeScheduleId": ccc_upgrade_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -975,7 +974,7 @@ def get_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1116,7 +1115,7 @@ def list_ccc_infrastructures(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ccc_infrastructures got unknown kwargs: {extra_kwargs!r}") @@ -1162,14 +1161,14 @@ def list_ccc_infrastructures(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1310,7 +1309,7 @@ def list_ccc_upgrade_schedules(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ccc_upgrade_schedules got unknown kwargs: {extra_kwargs!r}") @@ -1356,14 +1355,14 @@ def list_ccc_upgrade_schedules(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1457,7 +1456,7 @@ def update_ccc_infrastructure(self, ccc_infrastructure_id, update_ccc_infrastruc "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ccc_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -1466,10 +1465,10 @@ def update_ccc_infrastructure(self, ccc_infrastructure_id, update_ccc_infrastruc "cccInfrastructureId": ccc_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1478,7 +1477,7 @@ def update_ccc_infrastructure(self, ccc_infrastructure_id, update_ccc_infrastruc "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1572,7 +1571,7 @@ def update_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, update_ccc_upgrad "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ccc_upgrade_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1581,10 +1580,10 @@ def update_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, update_ccc_upgrad "cccUpgradeScheduleId": ccc_upgrade_schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1593,7 +1592,7 @@ def update_ccc_upgrade_schedule(self, ccc_upgrade_schedule_id, update_ccc_upgrad "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/compute_instance_agent/compute_instance_agent_client.py b/src/oci/compute_instance_agent/compute_instance_agent_client.py index 55bf6a5c43..4dcdbc6d67 100644 --- a/src/oci/compute_instance_agent/compute_instance_agent_client.py +++ b/src/oci/compute_instance_agent/compute_instance_agent_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def cancel_instance_agent_command(self, instance_agent_command_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_instance_agent_command got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def cancel_instance_agent_command(self, instance_agent_command_id, **kwargs): "instanceAgentCommandId": instance_agent_command_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -193,7 +192,7 @@ def cancel_instance_agent_command(self, instance_agent_command_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -282,7 +281,7 @@ def create_instance_agent_command(self, create_instance_agent_command_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_instance_agent_command got unknown kwargs: {extra_kwargs!r}") @@ -293,7 +292,7 @@ def create_instance_agent_command(self, create_instance_agent_command_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -373,7 +372,7 @@ def get_instance_agent_command(self, instance_agent_command_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_agent_command got unknown kwargs: {extra_kwargs!r}") @@ -382,10 +381,10 @@ def get_instance_agent_command(self, instance_agent_command_id, **kwargs): "instanceAgentCommandId": instance_agent_command_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -393,7 +392,7 @@ def get_instance_agent_command(self, instance_agent_command_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -477,7 +476,7 @@ def get_instance_agent_command_execution(self, instance_agent_command_id, instan "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_agent_command_execution got unknown kwargs: {extra_kwargs!r}") @@ -486,23 +485,23 @@ def get_instance_agent_command_execution(self, instance_agent_command_id, instan "instanceAgentCommandId": instance_agent_command_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "instanceId": instance_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -630,7 +629,7 @@ def list_instance_agent_command_executions(self, compartment_id, instance_id, ** "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_agent_command_executions got unknown kwargs: {extra_kwargs!r}") @@ -665,14 +664,14 @@ def list_instance_agent_command_executions(self, compartment_id, instance_id, ** "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -786,7 +785,7 @@ def list_instance_agent_commands(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_agent_commands got unknown kwargs: {extra_kwargs!r}") @@ -812,14 +811,14 @@ def list_instance_agent_commands(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/compute_instance_agent/plugin_client.py b/src/oci/compute_instance_agent/plugin_client.py index 43fa85d3c5..f9bf0b08f4 100644 --- a/src/oci/compute_instance_agent/plugin_client.py +++ b/src/oci/compute_instance_agent/plugin_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def get_instance_agent_plugin(self, instanceagent_id, compartment_id, plugin_nam "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_agent_plugin got unknown kwargs: {extra_kwargs!r}") @@ -178,23 +177,23 @@ def get_instance_agent_plugin(self, instanceagent_id, compartment_id, plugin_nam "pluginName": plugin_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -323,7 +322,7 @@ def list_instance_agent_plugins(self, compartment_id, instanceagent_id, **kwargs "sort_order", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_agent_plugins got unknown kwargs: {extra_kwargs!r}") @@ -332,10 +331,10 @@ def list_instance_agent_plugins(self, compartment_id, instanceagent_id, **kwargs "instanceagentId": instanceagent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'status' in kwargs: @@ -368,14 +367,14 @@ def list_instance_agent_plugins(self, compartment_id, instanceagent_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/compute_instance_agent/pluginconfig_client.py b/src/oci/compute_instance_agent/pluginconfig_client.py index e87701d8ae..9af6e66f53 100644 --- a/src/oci/compute_instance_agent/pluginconfig_client.py +++ b/src/oci/compute_instance_agent/pluginconfig_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -212,7 +211,7 @@ def list_instanceagent_available_plugins(self, compartment_id, os_name, os_versi "sort_order", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instanceagent_available_plugins got unknown kwargs: {extra_kwargs!r}") @@ -241,14 +240,14 @@ def list_instanceagent_available_plugins(self, compartment_id, os_name, os_versi "sortOrder": kwargs.get("sort_order", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/config.py b/src/oci/config.py index bbeac34cb1..64a95ea458 100644 --- a/src/oci/config.py +++ b/src/oci/config.py @@ -29,7 +29,6 @@ import os import re import logging -from oci._vendor import six from .exceptions import ConfigFileNotFound, ProfileNotFound, InvalidConfig, InvalidKeyFilePath from .auth import signers @@ -154,7 +153,7 @@ def validate_config(config, **kwargs): else: errors[required_key] = "missing" - for key, pattern in six.iteritems(PATTERNS): + for key, pattern in PATTERNS.items(): if key in errors: # key is missing, can't possibly match pattern continue diff --git a/src/oci/container_engine/container_engine_client.py b/src/oci/container_engine/container_engine_client.py index f8426240cf..a0042a174d 100644 --- a/src/oci/container_engine/container_engine_client.py +++ b/src/oci/container_engine/container_engine_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def cluster_migrate_to_native_vcn(self, cluster_id, cluster_migrate_to_native_vc "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cluster_migrate_to_native_vcn got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def cluster_migrate_to_native_vcn(self, cluster_id, cluster_migrate_to_native_vc "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -191,7 +190,7 @@ def cluster_migrate_to_native_vcn(self, cluster_id, cluster_migrate_to_native_vc "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def complete_credential_rotation(self, cluster_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"complete_credential_rotation got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def complete_credential_rotation(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -303,7 +302,7 @@ def complete_credential_rotation(self, cluster_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -386,7 +385,7 @@ def create_cluster(self, create_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cluster got unknown kwargs: {extra_kwargs!r}") @@ -397,7 +396,7 @@ def create_cluster(self, create_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def create_kubeconfig(self, cluster_id, **kwargs): "opc_request_id", "create_cluster_kubeconfig_content_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_kubeconfig got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def create_kubeconfig(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def create_kubeconfig(self, cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -585,7 +584,7 @@ def create_node_pool(self, create_node_pool_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -596,7 +595,7 @@ def create_node_pool(self, create_node_pool_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -679,7 +678,7 @@ def create_virtual_node_pool(self, create_virtual_node_pool_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_virtual_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -690,7 +689,7 @@ def create_virtual_node_pool(self, create_virtual_node_pool_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -776,7 +775,7 @@ def create_workload_mapping(self, cluster_id, create_workload_mapping_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_workload_mapping got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def create_workload_mapping(self, cluster_id, create_workload_mapping_details, * "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -797,7 +796,7 @@ def create_workload_mapping(self, cluster_id, create_workload_mapping_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -885,7 +884,7 @@ def delete_cluster(self, cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cluster got unknown kwargs: {extra_kwargs!r}") @@ -894,10 +893,10 @@ def delete_cluster(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -906,7 +905,7 @@ def delete_cluster(self, cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1005,7 +1004,7 @@ def delete_node(self, node_pool_id, node_id, **kwargs): "override_eviction_grace_duration", "is_force_deletion_after_override_grace_duration" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_node got unknown kwargs: {extra_kwargs!r}") @@ -1015,10 +1014,10 @@ def delete_node(self, node_pool_id, node_id, **kwargs): "nodeId": node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1026,7 +1025,7 @@ def delete_node(self, node_pool_id, node_id, **kwargs): "overrideEvictionGraceDuration": kwargs.get("override_eviction_grace_duration", missing), "isForceDeletionAfterOverrideGraceDuration": kwargs.get("is_force_deletion_after_override_grace_duration", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1034,7 +1033,7 @@ def delete_node(self, node_pool_id, node_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1128,7 +1127,7 @@ def delete_node_pool(self, node_pool_id, **kwargs): "override_eviction_grace_duration", "is_force_deletion_after_override_grace_duration" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -1137,17 +1136,17 @@ def delete_node_pool(self, node_pool_id, **kwargs): "nodePoolId": node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "overrideEvictionGraceDuration": kwargs.get("override_eviction_grace_duration", missing), "isForceDeletionAfterOverrideGraceDuration": kwargs.get("is_force_deletion_after_override_grace_duration", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1155,7 +1154,7 @@ def delete_node_pool(self, node_pool_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1249,7 +1248,7 @@ def delete_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "override_eviction_grace_duration_vnp", "is_force_deletion_after_override_grace_duration_vnp" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_virtual_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -1258,17 +1257,17 @@ def delete_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "virtualNodePoolId": virtual_node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "overrideEvictionGraceDurationVnp": kwargs.get("override_eviction_grace_duration_vnp", missing), "isForceDeletionAfterOverrideGraceDurationVnp": kwargs.get("is_force_deletion_after_override_grace_duration_vnp", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1276,7 +1275,7 @@ def delete_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1361,7 +1360,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1370,10 +1369,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1382,7 +1381,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1468,7 +1467,7 @@ def delete_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_workload_mapping got unknown kwargs: {extra_kwargs!r}") @@ -1478,10 +1477,10 @@ def delete_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "workloadMappingId": workload_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1490,7 +1489,7 @@ def delete_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1579,7 +1578,7 @@ def disable_addon(self, cluster_id, addon_name, is_remove_existing_add_on, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_addon got unknown kwargs: {extra_kwargs!r}") @@ -1589,16 +1588,16 @@ def disable_addon(self, cluster_id, addon_name, is_remove_existing_add_on, **kwa "addonName": addon_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isRemoveExistingAddOn": is_remove_existing_add_on } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1606,7 +1605,7 @@ def disable_addon(self, cluster_id, addon_name, is_remove_existing_add_on, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1688,7 +1687,7 @@ def get_addon(self, cluster_id, addon_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_addon got unknown kwargs: {extra_kwargs!r}") @@ -1698,10 +1697,10 @@ def get_addon(self, cluster_id, addon_name, **kwargs): "addonName": addon_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1709,7 +1708,7 @@ def get_addon(self, cluster_id, addon_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1788,7 +1787,7 @@ def get_cluster(self, cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1797,10 +1796,10 @@ def get_cluster(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1808,7 +1807,7 @@ def get_cluster(self, cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1887,7 +1886,7 @@ def get_cluster_migrate_to_native_vcn_status(self, cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster_migrate_to_native_vcn_status got unknown kwargs: {extra_kwargs!r}") @@ -1896,10 +1895,10 @@ def get_cluster_migrate_to_native_vcn_status(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1907,7 +1906,7 @@ def get_cluster_migrate_to_native_vcn_status(self, cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1990,7 +1989,7 @@ def get_cluster_options(self, cluster_option_id, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster_options got unknown kwargs: {extra_kwargs!r}") @@ -1999,23 +1998,23 @@ def get_cluster_options(self, cluster_option_id, **kwargs): "clusterOptionId": cluster_option_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2096,7 +2095,7 @@ def get_credential_rotation_status(self, cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_credential_rotation_status got unknown kwargs: {extra_kwargs!r}") @@ -2105,10 +2104,10 @@ def get_credential_rotation_status(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2116,7 +2115,7 @@ def get_credential_rotation_status(self, cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2195,7 +2194,7 @@ def get_node_pool(self, node_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -2204,10 +2203,10 @@ def get_node_pool(self, node_pool_id, **kwargs): "nodePoolId": node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2215,7 +2214,7 @@ def get_node_pool(self, node_pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2298,7 +2297,7 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_node_pool_options got unknown kwargs: {extra_kwargs!r}") @@ -2307,23 +2306,23 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs): "nodePoolOptionId": node_pool_option_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2407,7 +2406,7 @@ def get_virtual_node(self, virtual_node_pool_id, virtual_node_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_node got unknown kwargs: {extra_kwargs!r}") @@ -2417,10 +2416,10 @@ def get_virtual_node(self, virtual_node_pool_id, virtual_node_id, **kwargs): "virtualNodeId": virtual_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2428,7 +2427,7 @@ def get_virtual_node(self, virtual_node_pool_id, virtual_node_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2507,7 +2506,7 @@ def get_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -2516,10 +2515,10 @@ def get_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "virtualNodePoolId": virtual_node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2527,7 +2526,7 @@ def get_virtual_node_pool(self, virtual_node_pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2606,7 +2605,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2615,10 +2614,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2626,7 +2625,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2708,7 +2707,7 @@ def get_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_workload_mapping got unknown kwargs: {extra_kwargs!r}") @@ -2718,10 +2717,10 @@ def get_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "workloadMappingId": workload_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2729,7 +2728,7 @@ def get_workload_mapping(self, cluster_id, workload_mapping_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2822,7 +2821,7 @@ def install_addon(self, cluster_id, install_addon_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_addon got unknown kwargs: {extra_kwargs!r}") @@ -2831,10 +2830,10 @@ def install_addon(self, cluster_id, install_addon_details, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2844,7 +2843,7 @@ def install_addon(self, cluster_id, install_addon_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2955,7 +2954,7 @@ def list_addon_options(self, kubernetes_version, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addon_options got unknown kwargs: {extra_kwargs!r}") @@ -2982,14 +2981,14 @@ def list_addon_options(self, kubernetes_version, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3095,7 +3094,7 @@ def list_addons(self, cluster_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addons got unknown kwargs: {extra_kwargs!r}") @@ -3104,10 +3103,10 @@ def list_addons(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3130,14 +3129,14 @@ def list_addons(self, cluster_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3255,7 +3254,7 @@ def list_clusters(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_clusters got unknown kwargs: {extra_kwargs!r}") @@ -3291,14 +3290,14 @@ def list_clusters(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3418,7 +3417,7 @@ def list_node_pools(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_node_pools got unknown kwargs: {extra_kwargs!r}") @@ -3455,14 +3454,14 @@ def list_node_pools(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": self.base_client.generate_collection_format_param(kwargs.get("lifecycle_state", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3576,7 +3575,7 @@ def list_pod_shapes(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pod_shapes got unknown kwargs: {extra_kwargs!r}") @@ -3604,14 +3603,14 @@ def list_pod_shapes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3731,7 +3730,7 @@ def list_virtual_node_pools(self, compartment_id, **kwargs): "sort_by", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_node_pools got unknown kwargs: {extra_kwargs!r}") @@ -3768,14 +3767,14 @@ def list_virtual_node_pools(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": self.base_client.generate_collection_format_param(kwargs.get("lifecycle_state", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3885,7 +3884,7 @@ def list_virtual_nodes(self, virtual_node_pool_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_nodes got unknown kwargs: {extra_kwargs!r}") @@ -3894,10 +3893,10 @@ def list_virtual_nodes(self, virtual_node_pool_id, **kwargs): "virtualNodePoolId": virtual_node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3921,14 +3920,14 @@ def list_virtual_nodes(self, virtual_node_pool_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4012,7 +4011,7 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4021,23 +4020,23 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4121,7 +4120,7 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4130,23 +4129,23 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4272,7 +4271,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4309,14 +4308,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4422,7 +4421,7 @@ def list_workload_mappings(self, cluster_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_workload_mappings got unknown kwargs: {extra_kwargs!r}") @@ -4431,10 +4430,10 @@ def list_workload_mappings(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4457,14 +4456,14 @@ def list_workload_mappings(self, cluster_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4559,7 +4558,7 @@ def start_credential_rotation(self, cluster_id, start_credential_rotation_detail "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_credential_rotation got unknown kwargs: {extra_kwargs!r}") @@ -4568,10 +4567,10 @@ def start_credential_rotation(self, cluster_id, start_credential_rotation_detail "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4581,7 +4580,7 @@ def start_credential_rotation(self, cluster_id, start_credential_rotation_detail "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4673,7 +4672,7 @@ def update_addon(self, cluster_id, addon_name, update_addon_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_addon got unknown kwargs: {extra_kwargs!r}") @@ -4683,10 +4682,10 @@ def update_addon(self, cluster_id, addon_name, update_addon_details, **kwargs): "addonName": addon_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4695,7 +4694,7 @@ def update_addon(self, cluster_id, addon_name, update_addon_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4783,7 +4782,7 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cluster got unknown kwargs: {extra_kwargs!r}") @@ -4792,10 +4791,10 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4804,7 +4803,7 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4892,7 +4891,7 @@ def update_cluster_endpoint_config(self, cluster_id, update_cluster_endpoint_con "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cluster_endpoint_config got unknown kwargs: {extra_kwargs!r}") @@ -4901,10 +4900,10 @@ def update_cluster_endpoint_config(self, cluster_id, update_cluster_endpoint_con "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4913,7 +4912,7 @@ def update_cluster_endpoint_config(self, cluster_id, update_cluster_endpoint_con "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5010,7 +5009,7 @@ def update_node_pool(self, node_pool_id, update_node_pool_details, **kwargs): "override_eviction_grace_duration", "is_force_deletion_after_override_grace_duration" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -5019,17 +5018,17 @@ def update_node_pool(self, node_pool_id, update_node_pool_details, **kwargs): "nodePoolId": node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "overrideEvictionGraceDuration": kwargs.get("override_eviction_grace_duration", missing), "isForceDeletionAfterOverrideGraceDuration": kwargs.get("is_force_deletion_after_override_grace_duration", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5037,7 +5036,7 @@ def update_node_pool(self, node_pool_id, update_node_pool_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5127,7 +5126,7 @@ def update_virtual_node_pool(self, virtual_node_pool_id, update_virtual_node_poo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_virtual_node_pool got unknown kwargs: {extra_kwargs!r}") @@ -5136,10 +5135,10 @@ def update_virtual_node_pool(self, virtual_node_pool_id, update_virtual_node_poo "virtualNodePoolId": virtual_node_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5148,7 +5147,7 @@ def update_virtual_node_pool(self, virtual_node_pool_id, update_virtual_node_poo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5239,7 +5238,7 @@ def update_workload_mapping(self, cluster_id, workload_mapping_id, update_worklo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_workload_mapping got unknown kwargs: {extra_kwargs!r}") @@ -5249,10 +5248,10 @@ def update_workload_mapping(self, cluster_id, workload_mapping_id, update_worklo "workloadMappingId": workload_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5261,7 +5260,7 @@ def update_workload_mapping(self, cluster_id, workload_mapping_id, update_worklo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/container_instances/container_instance_client.py b/src/oci/container_instances/container_instance_client.py index 4da8f6c367..a5f48acb56 100644 --- a/src/oci/container_instances/container_instance_client.py +++ b/src/oci/container_instances/container_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -171,7 +170,7 @@ def change_container_instance_compartment(self, container_instance_id, change_co "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_container_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -180,10 +179,10 @@ def change_container_instance_compartment(self, container_instance_id, change_co "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -192,7 +191,7 @@ def change_container_instance_compartment(self, container_instance_id, change_co "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def create_container_instance(self, create_container_instance_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -289,7 +288,7 @@ def create_container_instance(self, create_container_instance_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -378,7 +377,7 @@ def delete_container_instance(self, container_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -387,10 +386,10 @@ def delete_container_instance(self, container_instance_id, **kwargs): "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -399,7 +398,7 @@ def delete_container_instance(self, container_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -477,7 +476,7 @@ def get_container(self, container_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container got unknown kwargs: {extra_kwargs!r}") @@ -486,10 +485,10 @@ def get_container(self, container_id, **kwargs): "containerId": container_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -497,7 +496,7 @@ def get_container(self, container_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -577,7 +576,7 @@ def get_container_instance(self, container_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -586,10 +585,10 @@ def get_container_instance(self, container_instance_id, **kwargs): "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -597,7 +596,7 @@ def get_container_instance(self, container_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -675,7 +674,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -684,10 +683,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -695,7 +694,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -793,7 +792,7 @@ def list_container_instance_shapes(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_instance_shapes got unknown kwargs: {extra_kwargs!r}") @@ -804,14 +803,14 @@ def list_container_instance_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -931,7 +930,7 @@ def list_container_instances(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_instances got unknown kwargs: {extra_kwargs!r}") @@ -967,14 +966,14 @@ def list_container_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1100,7 +1099,7 @@ def list_containers(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_containers got unknown kwargs: {extra_kwargs!r}") @@ -1137,14 +1136,14 @@ def list_containers(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1246,7 +1245,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1255,10 +1254,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1281,14 +1280,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1392,7 +1391,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1401,10 +1400,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1427,14 +1426,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1560,7 +1559,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "resource_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1597,14 +1596,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "resourceId": kwargs.get("resource_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1692,7 +1691,7 @@ def restart_container_instance(self, container_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -1701,10 +1700,10 @@ def restart_container_instance(self, container_instance_id, **kwargs): "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1713,7 +1712,7 @@ def restart_container_instance(self, container_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1796,7 +1795,7 @@ def retrieve_logs(self, container_id, **kwargs): "opc_request_id", "is_previous" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_logs got unknown kwargs: {extra_kwargs!r}") @@ -1805,23 +1804,23 @@ def retrieve_logs(self, container_id, **kwargs): "containerId": container_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isPrevious": kwargs.get("is_previous", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, text/plain", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1911,7 +1910,7 @@ def start_container_instance(self, container_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -1920,10 +1919,10 @@ def start_container_instance(self, container_instance_id, **kwargs): "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1932,7 +1931,7 @@ def start_container_instance(self, container_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2018,7 +2017,7 @@ def stop_container_instance(self, container_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -2027,10 +2026,10 @@ def stop_container_instance(self, container_instance_id, **kwargs): "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2039,7 +2038,7 @@ def stop_container_instance(self, container_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2128,7 +2127,7 @@ def update_container(self, container_id, update_container_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container got unknown kwargs: {extra_kwargs!r}") @@ -2137,10 +2136,10 @@ def update_container(self, container_id, update_container_details, **kwargs): "containerId": container_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2149,7 +2148,7 @@ def update_container(self, container_id, update_container_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2240,7 +2239,7 @@ def update_container_instance(self, container_instance_id, update_container_inst "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_instance got unknown kwargs: {extra_kwargs!r}") @@ -2249,10 +2248,10 @@ def update_container_instance(self, container_instance_id, update_container_inst "containerInstanceId": container_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2261,7 +2260,7 @@ def update_container_instance(self, container_instance_id, update_container_inst "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/core/blockstorage_client.py b/src/oci/core/blockstorage_client.py index ea085eca61..aa411bf149 100644 --- a/src/oci/core/blockstorage_client.py +++ b/src/oci/core/blockstorage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def change_boot_volume_backup_compartment(self, boot_volume_backup_id, change_bo "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_boot_volume_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def change_boot_volume_backup_compartment(self, boot_volume_backup_id, change_bo "bootVolumeBackupId": boot_volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def change_boot_volume_backup_compartment(self, boot_volume_backup_id, change_bo "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def change_boot_volume_compartment(self, boot_volume_id, change_boot_volume_comp "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_boot_volume_compartment got unknown kwargs: {extra_kwargs!r}") @@ -287,10 +286,10 @@ def change_boot_volume_compartment(self, boot_volume_id, change_boot_volume_comp "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -298,7 +297,7 @@ def change_boot_volume_compartment(self, boot_volume_id, change_boot_volume_comp "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def change_volume_backup_compartment(self, volume_backup_id, change_volume_backu "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_volume_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def change_volume_backup_compartment(self, volume_backup_id, change_volume_backu "volumeBackupId": volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -402,7 +401,7 @@ def change_volume_backup_compartment(self, volume_backup_id, change_volume_backu "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -486,7 +485,7 @@ def change_volume_compartment(self, volume_id, change_volume_compartment_details "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_volume_compartment got unknown kwargs: {extra_kwargs!r}") @@ -495,10 +494,10 @@ def change_volume_compartment(self, volume_id, change_volume_compartment_details "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -506,7 +505,7 @@ def change_volume_compartment(self, volume_id, change_volume_compartment_details "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -590,7 +589,7 @@ def change_volume_group_backup_compartment(self, volume_group_backup_id, change_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_volume_group_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -599,10 +598,10 @@ def change_volume_group_backup_compartment(self, volume_group_backup_id, change_ "volumeGroupBackupId": volume_group_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -610,7 +609,7 @@ def change_volume_group_backup_compartment(self, volume_group_backup_id, change_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def change_volume_group_compartment(self, volume_group_id, change_volume_group_c "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_volume_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -703,10 +702,10 @@ def change_volume_group_compartment(self, volume_group_id, change_volume_group_c "volumeGroupId": volume_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -714,7 +713,7 @@ def change_volume_group_compartment(self, volume_group_id, change_volume_group_c "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -805,7 +804,7 @@ def copy_boot_volume_backup(self, boot_volume_backup_id, copy_boot_volume_backup "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"copy_boot_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -814,10 +813,10 @@ def copy_boot_volume_backup(self, boot_volume_backup_id, copy_boot_volume_backup "bootVolumeBackupId": boot_volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -826,7 +825,7 @@ def copy_boot_volume_backup(self, boot_volume_backup_id, copy_boot_volume_backup "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -920,7 +919,7 @@ def copy_volume_backup(self, volume_backup_id, copy_volume_backup_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"copy_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -929,10 +928,10 @@ def copy_volume_backup(self, volume_backup_id, copy_volume_backup_details, **kwa "volumeBackupId": volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -941,7 +940,7 @@ def copy_volume_backup(self, volume_backup_id, copy_volume_backup_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1035,7 +1034,7 @@ def copy_volume_group_backup(self, volume_group_backup_id, copy_volume_group_bac "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"copy_volume_group_backup got unknown kwargs: {extra_kwargs!r}") @@ -1044,10 +1043,10 @@ def copy_volume_group_backup(self, volume_group_backup_id, copy_volume_group_bac "volumeGroupBackupId": volume_group_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1056,7 +1055,7 @@ def copy_volume_group_backup(self, volume_group_backup_id, copy_volume_group_bac "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1144,7 +1143,7 @@ def create_boot_volume(self, create_boot_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -1154,7 +1153,7 @@ def create_boot_volume(self, create_boot_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1242,7 +1241,7 @@ def create_boot_volume_backup(self, create_boot_volume_backup_details, **kwargs) "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_boot_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -1252,7 +1251,7 @@ def create_boot_volume_backup(self, create_boot_volume_backup_details, **kwargs) "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1350,7 +1349,7 @@ def create_volume(self, create_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume got unknown kwargs: {extra_kwargs!r}") @@ -1360,7 +1359,7 @@ def create_volume(self, create_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1448,7 +1447,7 @@ def create_volume_backup(self, create_volume_backup_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -1458,7 +1457,7 @@ def create_volume_backup(self, create_volume_backup_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1549,7 +1548,7 @@ def create_volume_backup_policy(self, create_volume_backup_policy_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume_backup_policy got unknown kwargs: {extra_kwargs!r}") @@ -1560,7 +1559,7 @@ def create_volume_backup_policy(self, create_volume_backup_policy_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1631,7 +1630,7 @@ def create_volume_backup_policy_assignment(self, create_volume_backup_policy_ass api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeBackupPolicyAssignment/CreateVolumeBackupPolicyAssignment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume_backup_policy_assignment got unknown kwargs: {extra_kwargs!r}") @@ -1727,7 +1726,7 @@ def create_volume_group(self, create_volume_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume_group got unknown kwargs: {extra_kwargs!r}") @@ -1737,7 +1736,7 @@ def create_volume_group(self, create_volume_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1821,7 +1820,7 @@ def create_volume_group_backup(self, create_volume_group_backup_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_volume_group_backup got unknown kwargs: {extra_kwargs!r}") @@ -1831,7 +1830,7 @@ def create_volume_group_backup(self, create_volume_group_backup_details, **kwarg "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1915,7 +1914,7 @@ def delete_boot_volume(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -1924,10 +1923,10 @@ def delete_boot_volume(self, boot_volume_id, **kwargs): "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1935,7 +1934,7 @@ def delete_boot_volume(self, boot_volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2011,7 +2010,7 @@ def delete_boot_volume_backup(self, boot_volume_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_boot_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -2020,10 +2019,10 @@ def delete_boot_volume_backup(self, boot_volume_backup_id, **kwargs): "bootVolumeBackupId": boot_volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2031,7 +2030,7 @@ def delete_boot_volume_backup(self, boot_volume_backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2107,7 +2106,7 @@ def delete_boot_volume_kms_key(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_boot_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -2116,10 +2115,10 @@ def delete_boot_volume_kms_key(self, boot_volume_id, **kwargs): "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2127,7 +2126,7 @@ def delete_boot_volume_kms_key(self, boot_volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2208,7 +2207,7 @@ def delete_volume(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume got unknown kwargs: {extra_kwargs!r}") @@ -2217,10 +2216,10 @@ def delete_volume(self, volume_id, **kwargs): "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2228,7 +2227,7 @@ def delete_volume(self, volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2304,7 +2303,7 @@ def delete_volume_backup(self, volume_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -2313,10 +2312,10 @@ def delete_volume_backup(self, volume_backup_id, **kwargs): "volumeBackupId": volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2324,7 +2323,7 @@ def delete_volume_backup(self, volume_backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2411,7 +2410,7 @@ def delete_volume_backup_policy(self, policy_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_backup_policy got unknown kwargs: {extra_kwargs!r}") @@ -2420,10 +2419,10 @@ def delete_volume_backup_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2432,7 +2431,7 @@ def delete_volume_backup_policy(self, policy_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2508,7 +2507,7 @@ def delete_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs) "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_backup_policy_assignment got unknown kwargs: {extra_kwargs!r}") @@ -2517,10 +2516,10 @@ def delete_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs) "policyAssignmentId": policy_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2528,7 +2527,7 @@ def delete_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs) "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2607,7 +2606,7 @@ def delete_volume_group(self, volume_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_group got unknown kwargs: {extra_kwargs!r}") @@ -2616,10 +2615,10 @@ def delete_volume_group(self, volume_group_id, **kwargs): "volumeGroupId": volume_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2627,7 +2626,7 @@ def delete_volume_group(self, volume_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2706,7 +2705,7 @@ def delete_volume_group_backup(self, volume_group_backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_group_backup got unknown kwargs: {extra_kwargs!r}") @@ -2715,10 +2714,10 @@ def delete_volume_group_backup(self, volume_group_backup_id, **kwargs): "volumeGroupBackupId": volume_group_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2726,7 +2725,7 @@ def delete_volume_group_backup(self, volume_group_backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2802,7 +2801,7 @@ def delete_volume_kms_key(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -2811,10 +2810,10 @@ def delete_volume_kms_key(self, volume_id, **kwargs): "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2822,7 +2821,7 @@ def delete_volume_kms_key(self, volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2888,7 +2887,7 @@ def get_block_volume_replica(self, block_volume_replica_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/BlockVolumeReplica/GetBlockVolumeReplica" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_block_volume_replica got unknown kwargs: {extra_kwargs!r}") @@ -2897,10 +2896,10 @@ def get_block_volume_replica(self, block_volume_replica_id, **kwargs): "blockVolumeReplicaId": block_volume_replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2974,7 +2973,7 @@ def get_boot_volume(self, boot_volume_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/BootVolume/GetBootVolume" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -2983,10 +2982,10 @@ def get_boot_volume(self, boot_volume_id, **kwargs): "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3060,7 +3059,7 @@ def get_boot_volume_backup(self, boot_volume_backup_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/BootVolumeBackup/GetBootVolumeBackup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_boot_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -3069,10 +3068,10 @@ def get_boot_volume_backup(self, boot_volume_backup_id, **kwargs): "bootVolumeBackupId": boot_volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3156,7 +3155,7 @@ def get_boot_volume_kms_key(self, boot_volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_boot_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -3165,10 +3164,10 @@ def get_boot_volume_kms_key(self, boot_volume_id, **kwargs): "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3176,7 +3175,7 @@ def get_boot_volume_kms_key(self, boot_volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3244,7 +3243,7 @@ def get_boot_volume_replica(self, boot_volume_replica_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/BootVolumeReplica/GetBootVolumeReplica" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_boot_volume_replica got unknown kwargs: {extra_kwargs!r}") @@ -3253,10 +3252,10 @@ def get_boot_volume_replica(self, boot_volume_replica_id, **kwargs): "bootVolumeReplicaId": boot_volume_replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3330,7 +3329,7 @@ def get_volume(self, volume_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Volume/GetVolume" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume got unknown kwargs: {extra_kwargs!r}") @@ -3339,10 +3338,10 @@ def get_volume(self, volume_id, **kwargs): "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3416,7 +3415,7 @@ def get_volume_backup(self, volume_backup_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeBackup/GetVolumeBackup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -3425,10 +3424,10 @@ def get_volume_backup(self, volume_backup_id, **kwargs): "volumeBackupId": volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3502,7 +3501,7 @@ def get_volume_backup_policy(self, policy_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeBackupPolicy/GetVolumeBackupPolicy" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_backup_policy got unknown kwargs: {extra_kwargs!r}") @@ -3511,10 +3510,10 @@ def get_volume_backup_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3612,7 +3611,7 @@ def get_volume_backup_policy_asset_assignment(self, asset_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_backup_policy_asset_assignment got unknown kwargs: {extra_kwargs!r}") @@ -3622,7 +3621,7 @@ def get_volume_backup_policy_asset_assignment(self, asset_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3695,7 +3694,7 @@ def get_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeBackupPolicyAssignment/GetVolumeBackupPolicyAssignment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_backup_policy_assignment got unknown kwargs: {extra_kwargs!r}") @@ -3704,10 +3703,10 @@ def get_volume_backup_policy_assignment(self, policy_assignment_id, **kwargs): "policyAssignmentId": policy_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3783,7 +3782,7 @@ def get_volume_group(self, volume_group_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeGroup/GetVolumeGroup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_group got unknown kwargs: {extra_kwargs!r}") @@ -3792,10 +3791,10 @@ def get_volume_group(self, volume_group_id, **kwargs): "volumeGroupId": volume_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3871,7 +3870,7 @@ def get_volume_group_backup(self, volume_group_backup_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeGroupBackup/GetVolumeGroupBackup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_group_backup got unknown kwargs: {extra_kwargs!r}") @@ -3880,10 +3879,10 @@ def get_volume_group_backup(self, volume_group_backup_id, **kwargs): "volumeGroupBackupId": volume_group_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3957,7 +3956,7 @@ def get_volume_group_replica(self, volume_group_replica_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeGroupReplica/GetVolumeGroupReplica" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_group_replica got unknown kwargs: {extra_kwargs!r}") @@ -3966,10 +3965,10 @@ def get_volume_group_replica(self, volume_group_replica_id, **kwargs): "volumeGroupReplicaId": volume_group_replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4053,7 +4052,7 @@ def get_volume_kms_key(self, volume_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -4062,10 +4061,10 @@ def get_volume_kms_key(self, volume_id, **kwargs): "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4073,7 +4072,7 @@ def get_volume_kms_key(self, volume_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4206,7 +4205,7 @@ def list_block_volume_replicas(self, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_block_volume_replicas got unknown kwargs: {extra_kwargs!r}") @@ -4243,7 +4242,7 @@ def list_block_volume_replicas(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4379,7 +4378,7 @@ def list_boot_volume_backups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_boot_volume_backups got unknown kwargs: {extra_kwargs!r}") @@ -4416,7 +4415,7 @@ def list_boot_volume_backups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4554,7 +4553,7 @@ def list_boot_volume_replicas(self, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_boot_volume_replicas got unknown kwargs: {extra_kwargs!r}") @@ -4591,7 +4590,7 @@ def list_boot_volume_replicas(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4699,7 +4698,7 @@ def list_boot_volumes(self, **kwargs): "page", "volume_group_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_boot_volumes got unknown kwargs: {extra_kwargs!r}") @@ -4711,7 +4710,7 @@ def list_boot_volumes(self, **kwargs): "page": kwargs.get("page", missing), "volumeGroupId": kwargs.get("volume_group_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4813,7 +4812,7 @@ def list_volume_backup_policies(self, **kwargs): "page", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_backup_policies got unknown kwargs: {extra_kwargs!r}") @@ -4823,7 +4822,7 @@ def list_volume_backup_policies(self, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4959,7 +4958,7 @@ def list_volume_backups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_backups got unknown kwargs: {extra_kwargs!r}") @@ -4996,7 +4995,7 @@ def list_volume_backups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5124,7 +5123,7 @@ def list_volume_group_backups(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_group_backups got unknown kwargs: {extra_kwargs!r}") @@ -5152,7 +5151,7 @@ def list_volume_group_backups(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5287,7 +5286,7 @@ def list_volume_group_replicas(self, availability_domain, compartment_id, **kwar "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_group_replicas got unknown kwargs: {extra_kwargs!r}") @@ -5323,7 +5322,7 @@ def list_volume_group_replicas(self, availability_domain, compartment_id, **kwar "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5460,7 +5459,7 @@ def list_volume_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_groups got unknown kwargs: {extra_kwargs!r}") @@ -5496,7 +5495,7 @@ def list_volume_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5635,7 +5634,7 @@ def list_volumes(self, **kwargs): "volume_group_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volumes got unknown kwargs: {extra_kwargs!r}") @@ -5672,7 +5671,7 @@ def list_volumes(self, **kwargs): "volumeGroupId": kwargs.get("volume_group_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5758,7 +5757,7 @@ def update_boot_volume(self, boot_volume_id, update_boot_volume_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -5767,10 +5766,10 @@ def update_boot_volume(self, boot_volume_id, update_boot_volume_details, **kwarg "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5778,7 +5777,7 @@ def update_boot_volume(self, boot_volume_id, update_boot_volume_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5862,7 +5861,7 @@ def update_boot_volume_backup(self, boot_volume_backup_id, update_boot_volume_ba "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_boot_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -5871,10 +5870,10 @@ def update_boot_volume_backup(self, boot_volume_backup_id, update_boot_volume_ba "bootVolumeBackupId": boot_volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5882,7 +5881,7 @@ def update_boot_volume_backup(self, boot_volume_backup_id, update_boot_volume_ba "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5965,7 +5964,7 @@ def update_boot_volume_kms_key(self, boot_volume_id, update_boot_volume_kms_key_ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_boot_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -5974,10 +5973,10 @@ def update_boot_volume_kms_key(self, boot_volume_id, update_boot_volume_kms_key_ "bootVolumeId": boot_volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5985,7 +5984,7 @@ def update_boot_volume_kms_key(self, boot_volume_id, update_boot_volume_kms_key_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6069,7 +6068,7 @@ def update_volume(self, volume_id, update_volume_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume got unknown kwargs: {extra_kwargs!r}") @@ -6078,10 +6077,10 @@ def update_volume(self, volume_id, update_volume_details, **kwargs): "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6089,7 +6088,7 @@ def update_volume(self, volume_id, update_volume_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6173,7 +6172,7 @@ def update_volume_backup(self, volume_backup_id, update_volume_backup_details, * "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_backup got unknown kwargs: {extra_kwargs!r}") @@ -6182,10 +6181,10 @@ def update_volume_backup(self, volume_backup_id, update_volume_backup_details, * "volumeBackupId": volume_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6193,7 +6192,7 @@ def update_volume_backup(self, volume_backup_id, update_volume_backup_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6295,7 +6294,7 @@ def update_volume_backup_policy(self, policy_id, update_volume_backup_policy_det "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_backup_policy got unknown kwargs: {extra_kwargs!r}") @@ -6304,10 +6303,10 @@ def update_volume_backup_policy(self, policy_id, update_volume_backup_policy_det "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6317,7 +6316,7 @@ def update_volume_backup_policy(self, policy_id, update_volume_backup_policy_det "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6414,7 +6413,7 @@ def update_volume_group(self, volume_group_id, update_volume_group_details, **kw "if_match", "preserve_volume_replica" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_group got unknown kwargs: {extra_kwargs!r}") @@ -6423,23 +6422,23 @@ def update_volume_group(self, volume_group_id, update_volume_group_details, **kw "volumeGroupId": volume_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "preserveVolumeReplica": kwargs.get("preserve_volume_replica", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6526,7 +6525,7 @@ def update_volume_group_backup(self, volume_group_backup_id, update_volume_group "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_group_backup got unknown kwargs: {extra_kwargs!r}") @@ -6535,10 +6534,10 @@ def update_volume_group_backup(self, volume_group_backup_id, update_volume_group "volumeGroupBackupId": volume_group_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6546,7 +6545,7 @@ def update_volume_group_backup(self, volume_group_backup_id, update_volume_group "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6629,7 +6628,7 @@ def update_volume_kms_key(self, volume_id, update_volume_kms_key_details, **kwar "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -6638,10 +6637,10 @@ def update_volume_kms_key(self, volume_id, update_volume_kms_key_details, **kwar "volumeId": volume_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6649,7 +6648,7 @@ def update_volume_kms_key(self, volume_id, update_volume_kms_key_details, **kwar "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/core/compute_client.py b/src/oci/core/compute_client.py index e2f0aba38b..46c11c5547 100644 --- a/src/oci/core/compute_client.py +++ b/src/oci/core/compute_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def accept_shielded_integrity_policy(self, instance_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"accept_shielded_integrity_policy got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def accept_shielded_integrity_policy(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def accept_shielded_integrity_policy(self, instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -283,7 +282,7 @@ def add_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs): "retry_strategy", "add_image_shape_compatibility_entry_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_image_shape_compatibility_entry got unknown kwargs: {extra_kwargs!r}") @@ -293,10 +292,10 @@ def add_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs): "shapeName": shape_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -384,7 +383,7 @@ def attach_boot_volume(self, attach_boot_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -394,7 +393,7 @@ def attach_boot_volume(self, attach_boot_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def attach_vnic(self, attach_vnic_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_vnic got unknown kwargs: {extra_kwargs!r}") @@ -489,7 +488,7 @@ def attach_vnic(self, attach_vnic_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -570,7 +569,7 @@ def attach_volume(self, attach_volume_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_volume got unknown kwargs: {extra_kwargs!r}") @@ -580,7 +579,7 @@ def attach_volume(self, attach_volume_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -677,7 +676,7 @@ def capture_console_history(self, capture_console_history_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"capture_console_history got unknown kwargs: {extra_kwargs!r}") @@ -687,7 +686,7 @@ def capture_console_history(self, capture_console_history_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -786,7 +785,7 @@ def change_compute_capacity_reservation_compartment(self, capacity_reservation_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_compute_capacity_reservation_compartment got unknown kwargs: {extra_kwargs!r}") @@ -795,10 +794,10 @@ def change_compute_capacity_reservation_compartment(self, capacity_reservation_i "capacityReservationId": capacity_reservation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -808,7 +807,7 @@ def change_compute_capacity_reservation_compartment(self, capacity_reservation_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -908,7 +907,7 @@ def change_compute_capacity_topology_compartment(self, compute_capacity_topology "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_compute_capacity_topology_compartment got unknown kwargs: {extra_kwargs!r}") @@ -917,10 +916,10 @@ def change_compute_capacity_topology_compartment(self, compute_capacity_topology "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -930,7 +929,7 @@ def change_compute_capacity_topology_compartment(self, compute_capacity_topology "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1039,7 +1038,7 @@ def change_compute_cluster_compartment(self, compute_cluster_id, change_compute_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_compute_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1048,10 +1047,10 @@ def change_compute_cluster_compartment(self, compute_cluster_id, change_compute_ "computeClusterId": compute_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1061,7 +1060,7 @@ def change_compute_cluster_compartment(self, compute_cluster_id, change_compute_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1160,7 +1159,7 @@ def change_compute_image_capability_schema_compartment(self, compute_image_capab "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_compute_image_capability_schema_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1169,10 +1168,10 @@ def change_compute_image_capability_schema_compartment(self, compute_image_capab "computeImageCapabilitySchemaId": compute_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1182,7 +1181,7 @@ def change_compute_image_capability_schema_compartment(self, compute_image_capab "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1279,7 +1278,7 @@ def change_dedicated_vm_host_compartment(self, dedicated_vm_host_id, change_dedi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dedicated_vm_host_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1288,10 +1287,10 @@ def change_dedicated_vm_host_compartment(self, dedicated_vm_host_id, change_dedi "dedicatedVmHostId": dedicated_vm_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1301,7 +1300,7 @@ def change_dedicated_vm_host_compartment(self, dedicated_vm_host_id, change_dedi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1402,7 +1401,7 @@ def change_image_compartment(self, image_id, change_image_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_image_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1411,10 +1410,10 @@ def change_image_compartment(self, image_id, change_image_compartment_details, * "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1424,7 +1423,7 @@ def change_image_compartment(self, image_id, change_image_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1530,7 +1529,7 @@ def change_instance_compartment(self, instance_id, change_instance_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1539,10 +1538,10 @@ def change_instance_compartment(self, instance_id, change_instance_compartment_d "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1552,7 +1551,7 @@ def change_instance_compartment(self, instance_id, change_instance_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1633,7 +1632,7 @@ def create_app_catalog_subscription(self, create_app_catalog_subscription_detail "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_app_catalog_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1643,7 +1642,7 @@ def create_app_catalog_subscription(self, create_app_catalog_subscription_detail "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1736,7 +1735,7 @@ def create_compute_capacity_report(self, create_compute_capacity_report_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compute_capacity_report got unknown kwargs: {extra_kwargs!r}") @@ -1747,7 +1746,7 @@ def create_compute_capacity_report(self, create_compute_capacity_report_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1843,7 +1842,7 @@ def create_compute_capacity_reservation(self, create_compute_capacity_reservatio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compute_capacity_reservation got unknown kwargs: {extra_kwargs!r}") @@ -1854,7 +1853,7 @@ def create_compute_capacity_reservation(self, create_compute_capacity_reservatio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1945,7 +1944,7 @@ def create_compute_capacity_topology(self, create_compute_capacity_topology_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compute_capacity_topology got unknown kwargs: {extra_kwargs!r}") @@ -1956,7 +1955,7 @@ def create_compute_capacity_topology(self, create_compute_capacity_topology_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2071,7 +2070,7 @@ def create_compute_cluster(self, create_compute_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compute_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2082,7 +2081,7 @@ def create_compute_cluster(self, create_compute_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2163,7 +2162,7 @@ def create_compute_image_capability_schema(self, create_compute_image_capability "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compute_image_capability_schema got unknown kwargs: {extra_kwargs!r}") @@ -2173,7 +2172,7 @@ def create_compute_image_capability_schema(self, create_compute_image_capability "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2266,7 +2265,7 @@ def create_dedicated_vm_host(self, create_dedicated_vm_host_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dedicated_vm_host got unknown kwargs: {extra_kwargs!r}") @@ -2277,7 +2276,7 @@ def create_dedicated_vm_host(self, create_dedicated_vm_host_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2385,7 +2384,7 @@ def create_image(self, create_image_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_image got unknown kwargs: {extra_kwargs!r}") @@ -2395,7 +2394,7 @@ def create_image(self, create_image_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2484,7 +2483,7 @@ def create_instance_console_connection(self, create_instance_console_connection_ "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_instance_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -2494,7 +2493,7 @@ def create_instance_console_connection(self, create_instance_console_connection_ "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2571,7 +2570,7 @@ def delete_app_catalog_subscription(self, listing_id, compartment_id, resource_v api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_app_catalog_subscription got unknown kwargs: {extra_kwargs!r}") @@ -2581,7 +2580,7 @@ def delete_app_catalog_subscription(self, listing_id, compartment_id, resource_v "compartmentId": compartment_id, "resourceVersion": resource_version } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2667,7 +2666,7 @@ def delete_compute_capacity_reservation(self, capacity_reservation_id, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_compute_capacity_reservation got unknown kwargs: {extra_kwargs!r}") @@ -2676,10 +2675,10 @@ def delete_compute_capacity_reservation(self, capacity_reservation_id, **kwargs) "capacityReservationId": capacity_reservation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2688,7 +2687,7 @@ def delete_compute_capacity_reservation(self, capacity_reservation_id, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2771,7 +2770,7 @@ def delete_compute_capacity_topology(self, compute_capacity_topology_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_compute_capacity_topology got unknown kwargs: {extra_kwargs!r}") @@ -2780,10 +2779,10 @@ def delete_compute_capacity_topology(self, compute_capacity_topology_id, **kwarg "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2792,7 +2791,7 @@ def delete_compute_capacity_topology(self, compute_capacity_topology_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2886,7 +2885,7 @@ def delete_compute_cluster(self, compute_cluster_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_compute_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2895,10 +2894,10 @@ def delete_compute_cluster(self, compute_cluster_id, **kwargs): "computeClusterId": compute_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2907,7 +2906,7 @@ def delete_compute_cluster(self, compute_cluster_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2983,7 +2982,7 @@ def delete_compute_image_capability_schema(self, compute_image_capability_schema "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_compute_image_capability_schema got unknown kwargs: {extra_kwargs!r}") @@ -2992,10 +2991,10 @@ def delete_compute_image_capability_schema(self, compute_image_capability_schema "computeImageCapabilitySchemaId": compute_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3003,7 +3002,7 @@ def delete_compute_image_capability_schema(self, compute_image_capability_schema "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3079,7 +3078,7 @@ def delete_console_history(self, instance_console_history_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_console_history got unknown kwargs: {extra_kwargs!r}") @@ -3088,10 +3087,10 @@ def delete_console_history(self, instance_console_history_id, **kwargs): "instanceConsoleHistoryId": instance_console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3099,7 +3098,7 @@ def delete_console_history(self, instance_console_history_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3177,7 +3176,7 @@ def delete_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dedicated_vm_host got unknown kwargs: {extra_kwargs!r}") @@ -3186,10 +3185,10 @@ def delete_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "dedicatedVmHostId": dedicated_vm_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3197,7 +3196,7 @@ def delete_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3275,7 +3274,7 @@ def delete_image(self, image_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_image got unknown kwargs: {extra_kwargs!r}") @@ -3284,10 +3283,10 @@ def delete_image(self, image_id, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3295,7 +3294,7 @@ def delete_image(self, image_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3371,7 +3370,7 @@ def delete_instance_console_connection(self, instance_console_connection_id, **k "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_instance_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -3380,10 +3379,10 @@ def delete_instance_console_connection(self, instance_console_connection_id, **k "instanceConsoleConnectionId": instance_console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3391,7 +3390,7 @@ def delete_instance_console_connection(self, instance_console_connection_id, **k "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3470,7 +3469,7 @@ def detach_boot_volume(self, boot_volume_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_boot_volume got unknown kwargs: {extra_kwargs!r}") @@ -3479,10 +3478,10 @@ def detach_boot_volume(self, boot_volume_attachment_id, **kwargs): "bootVolumeAttachmentId": boot_volume_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3490,7 +3489,7 @@ def detach_boot_volume(self, boot_volume_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3577,7 +3576,7 @@ def detach_vnic(self, vnic_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_vnic got unknown kwargs: {extra_kwargs!r}") @@ -3586,10 +3585,10 @@ def detach_vnic(self, vnic_attachment_id, **kwargs): "vnicAttachmentId": vnic_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3597,7 +3596,7 @@ def detach_vnic(self, vnic_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3676,7 +3675,7 @@ def detach_volume(self, volume_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_volume got unknown kwargs: {extra_kwargs!r}") @@ -3685,10 +3684,10 @@ def detach_volume(self, volume_attachment_id, **kwargs): "volumeAttachmentId": volume_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3696,7 +3695,7 @@ def detach_volume(self, volume_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3799,7 +3798,7 @@ def export_image(self, image_id, export_image_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_image got unknown kwargs: {extra_kwargs!r}") @@ -3808,10 +3807,10 @@ def export_image(self, image_id, export_image_details, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3820,7 +3819,7 @@ def export_image(self, image_id, export_image_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3893,7 +3892,7 @@ def get_app_catalog_listing(self, listing_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/AppCatalogListing/GetAppCatalogListing" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_app_catalog_listing got unknown kwargs: {extra_kwargs!r}") @@ -3902,10 +3901,10 @@ def get_app_catalog_listing(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3984,7 +3983,7 @@ def get_app_catalog_listing_agreements(self, listing_id, resource_version, **kwa api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/AppCatalogListingResourceVersionAgreements/GetAppCatalogListingAgreements" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_app_catalog_listing_agreements got unknown kwargs: {extra_kwargs!r}") @@ -3994,10 +3993,10 @@ def get_app_catalog_listing_agreements(self, listing_id, resource_version, **kwa "resourceVersion": resource_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4076,7 +4075,7 @@ def get_app_catalog_listing_resource_version(self, listing_id, resource_version, api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/AppCatalogListingResourceVersion/GetAppCatalogListingResourceVersion" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_app_catalog_listing_resource_version got unknown kwargs: {extra_kwargs!r}") @@ -4086,10 +4085,10 @@ def get_app_catalog_listing_resource_version(self, listing_id, resource_version, "resourceVersion": resource_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4165,7 +4164,7 @@ def get_boot_volume_attachment(self, boot_volume_attachment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/BootVolumeAttachment/GetBootVolumeAttachment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_boot_volume_attachment got unknown kwargs: {extra_kwargs!r}") @@ -4174,10 +4173,10 @@ def get_boot_volume_attachment(self, boot_volume_attachment_id, **kwargs): "bootVolumeAttachmentId": boot_volume_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4260,7 +4259,7 @@ def get_compute_capacity_reservation(self, capacity_reservation_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_capacity_reservation got unknown kwargs: {extra_kwargs!r}") @@ -4269,10 +4268,10 @@ def get_compute_capacity_reservation(self, capacity_reservation_id, **kwargs): "capacityReservationId": capacity_reservation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4280,7 +4279,7 @@ def get_compute_capacity_reservation(self, capacity_reservation_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4359,7 +4358,7 @@ def get_compute_capacity_topology(self, compute_capacity_topology_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_capacity_topology got unknown kwargs: {extra_kwargs!r}") @@ -4368,10 +4367,10 @@ def get_compute_capacity_topology(self, compute_capacity_topology_id, **kwargs): "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4379,7 +4378,7 @@ def get_compute_capacity_topology(self, compute_capacity_topology_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4466,7 +4465,7 @@ def get_compute_cluster(self, compute_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_cluster got unknown kwargs: {extra_kwargs!r}") @@ -4475,10 +4474,10 @@ def get_compute_cluster(self, compute_cluster_id, **kwargs): "computeClusterId": compute_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4486,7 +4485,7 @@ def get_compute_cluster(self, compute_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4556,7 +4555,7 @@ def get_compute_global_image_capability_schema(self, compute_global_image_capabi api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ComputeGlobalImageCapabilitySchema/GetComputeGlobalImageCapabilitySchema" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_global_image_capability_schema got unknown kwargs: {extra_kwargs!r}") @@ -4565,10 +4564,10 @@ def get_compute_global_image_capability_schema(self, compute_global_image_capabi "computeGlobalImageCapabilitySchemaId": compute_global_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4649,7 +4648,7 @@ def get_compute_global_image_capability_schema_version(self, compute_global_imag api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ComputeGlobalImageCapabilitySchemaVersion/GetComputeGlobalImageCapabilitySchemaVersion" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_global_image_capability_schema_version got unknown kwargs: {extra_kwargs!r}") @@ -4659,10 +4658,10 @@ def get_compute_global_image_capability_schema_version(self, compute_global_imag "computeGlobalImageCapabilitySchemaVersionName": compute_global_image_capability_schema_version_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4746,7 +4745,7 @@ def get_compute_image_capability_schema(self, compute_image_capability_schema_id "retry_strategy", "is_merge_enabled" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compute_image_capability_schema got unknown kwargs: {extra_kwargs!r}") @@ -4755,16 +4754,16 @@ def get_compute_image_capability_schema(self, compute_image_capability_schema_id "computeImageCapabilitySchemaId": compute_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isMergeEnabled": kwargs.get("is_merge_enabled", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4843,7 +4842,7 @@ def get_console_history(self, instance_console_history_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ConsoleHistory/GetConsoleHistory" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_console_history got unknown kwargs: {extra_kwargs!r}") @@ -4852,10 +4851,10 @@ def get_console_history(self, instance_console_history_id, **kwargs): "instanceConsoleHistoryId": instance_console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4943,7 +4942,7 @@ def get_console_history_content(self, instance_console_history_id, **kwargs): "offset", "length" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_console_history_content got unknown kwargs: {extra_kwargs!r}") @@ -4952,17 +4951,17 @@ def get_console_history_content(self, instance_console_history_id, **kwargs): "instanceConsoleHistoryId": instance_console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "offset": kwargs.get("offset", missing), "length": kwargs.get("length", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5046,7 +5045,7 @@ def get_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dedicated_vm_host got unknown kwargs: {extra_kwargs!r}") @@ -5055,10 +5054,10 @@ def get_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "dedicatedVmHostId": dedicated_vm_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5066,7 +5065,7 @@ def get_dedicated_vm_host(self, dedicated_vm_host_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5136,7 +5135,7 @@ def get_image(self, image_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Image/GetImage" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_image got unknown kwargs: {extra_kwargs!r}") @@ -5145,10 +5144,10 @@ def get_image(self, image_id, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5238,7 +5237,7 @@ def get_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_image_shape_compatibility_entry got unknown kwargs: {extra_kwargs!r}") @@ -5248,10 +5247,10 @@ def get_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs): "shapeName": shape_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5259,7 +5258,7 @@ def get_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5334,7 +5333,7 @@ def get_instance(self, instance_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Instance/GetInstance" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance got unknown kwargs: {extra_kwargs!r}") @@ -5343,10 +5342,10 @@ def get_instance(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5420,7 +5419,7 @@ def get_instance_console_connection(self, instance_console_connection_id, **kwar api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstanceConsoleConnection/GetInstanceConsoleConnection" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -5429,10 +5428,10 @@ def get_instance_console_connection(self, instance_console_connection_id, **kwar "instanceConsoleConnectionId": instance_console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5520,7 +5519,7 @@ def get_instance_maintenance_reboot(self, instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_maintenance_reboot got unknown kwargs: {extra_kwargs!r}") @@ -5529,10 +5528,10 @@ def get_instance_maintenance_reboot(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5540,7 +5539,7 @@ def get_instance_maintenance_reboot(self, instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5619,7 +5618,7 @@ def get_measured_boot_report(self, instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_measured_boot_report got unknown kwargs: {extra_kwargs!r}") @@ -5628,10 +5627,10 @@ def get_measured_boot_report(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5639,7 +5638,7 @@ def get_measured_boot_report(self, instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5707,7 +5706,7 @@ def get_vnic_attachment(self, vnic_attachment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VnicAttachment/GetVnicAttachment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vnic_attachment got unknown kwargs: {extra_kwargs!r}") @@ -5716,10 +5715,10 @@ def get_vnic_attachment(self, vnic_attachment_id, **kwargs): "vnicAttachmentId": vnic_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5793,7 +5792,7 @@ def get_volume_attachment(self, volume_attachment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VolumeAttachment/GetVolumeAttachment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_volume_attachment got unknown kwargs: {extra_kwargs!r}") @@ -5802,10 +5801,10 @@ def get_volume_attachment(self, volume_attachment_id, **kwargs): "volumeAttachmentId": volume_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5882,7 +5881,7 @@ def get_windows_instance_initial_credentials(self, instance_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstanceCredentials/GetWindowsInstanceInitialCredentials" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_windows_instance_initial_credentials got unknown kwargs: {extra_kwargs!r}") @@ -5891,10 +5890,10 @@ def get_windows_instance_initial_credentials(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6043,7 +6042,7 @@ def instance_action(self, instance_id, action, **kwargs): "if_match", "instance_power_action_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"instance_action got unknown kwargs: {extra_kwargs!r}") @@ -6052,16 +6051,16 @@ def instance_action(self, instance_id, action, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "action": action } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6069,7 +6068,7 @@ def instance_action(self, instance_id, action, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6201,7 +6200,7 @@ def launch_instance(self, launch_instance_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"launch_instance got unknown kwargs: {extra_kwargs!r}") @@ -6211,7 +6210,7 @@ def launch_instance(self, launch_instance_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6309,7 +6308,7 @@ def list_app_catalog_listing_resource_versions(self, listing_id, **kwargs): "page", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_app_catalog_listing_resource_versions got unknown kwargs: {extra_kwargs!r}") @@ -6318,10 +6317,10 @@ def list_app_catalog_listing_resource_versions(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6336,7 +6335,7 @@ def list_app_catalog_listing_resource_versions(self, listing_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6451,7 +6450,7 @@ def list_app_catalog_listings(self, **kwargs): "publisher_type", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_app_catalog_listings got unknown kwargs: {extra_kwargs!r}") @@ -6471,7 +6470,7 @@ def list_app_catalog_listings(self, **kwargs): "publisherType": kwargs.get("publisher_type", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6594,7 +6593,7 @@ def list_app_catalog_subscriptions(self, compartment_id, **kwargs): "sort_order", "listing_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_app_catalog_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -6621,7 +6620,7 @@ def list_app_catalog_subscriptions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "listingId": kwargs.get("listing_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6734,7 +6733,7 @@ def list_boot_volume_attachments(self, availability_domain, compartment_id, **kw "instance_id", "boot_volume_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_boot_volume_attachments got unknown kwargs: {extra_kwargs!r}") @@ -6747,7 +6746,7 @@ def list_boot_volume_attachments(self, availability_domain, compartment_id, **kw "instanceId": kwargs.get("instance_id", missing), "bootVolumeId": kwargs.get("boot_volume_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", @@ -6879,7 +6878,7 @@ def list_compute_capacity_reservation_instance_shapes(self, compartment_id, **kw "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_reservation_instance_shapes got unknown kwargs: {extra_kwargs!r}") @@ -6907,14 +6906,14 @@ def list_compute_capacity_reservation_instance_shapes(self, compartment_id, **kw "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7041,7 +7040,7 @@ def list_compute_capacity_reservation_instances(self, capacity_reservation_id, * "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_reservation_instances got unknown kwargs: {extra_kwargs!r}") @@ -7050,10 +7049,10 @@ def list_compute_capacity_reservation_instances(self, capacity_reservation_id, * "capacityReservationId": capacity_reservation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -7078,14 +7077,14 @@ def list_compute_capacity_reservation_instances(self, capacity_reservation_id, * "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7223,7 +7222,7 @@ def list_compute_capacity_reservations(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_reservations got unknown kwargs: {extra_kwargs!r}") @@ -7259,14 +7258,14 @@ def list_compute_capacity_reservations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7394,7 +7393,7 @@ def list_compute_capacity_topologies(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_topologies got unknown kwargs: {extra_kwargs!r}") @@ -7422,14 +7421,14 @@ def list_compute_capacity_topologies(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7578,7 +7577,7 @@ def list_compute_capacity_topology_compute_bare_metal_hosts(self, compute_capaci "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_topology_compute_bare_metal_hosts got unknown kwargs: {extra_kwargs!r}") @@ -7587,10 +7586,10 @@ def list_compute_capacity_topology_compute_bare_metal_hosts(self, compute_capaci "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -7618,14 +7617,14 @@ def list_compute_capacity_topology_compute_bare_metal_hosts(self, compute_capaci "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7758,7 +7757,7 @@ def list_compute_capacity_topology_compute_hpc_islands(self, compute_capacity_to "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_topology_compute_hpc_islands got unknown kwargs: {extra_kwargs!r}") @@ -7767,10 +7766,10 @@ def list_compute_capacity_topology_compute_hpc_islands(self, compute_capacity_to "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -7795,14 +7794,14 @@ def list_compute_capacity_topology_compute_hpc_islands(self, compute_capacity_to "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7941,7 +7940,7 @@ def list_compute_capacity_topology_compute_network_blocks(self, compute_capacity "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_capacity_topology_compute_network_blocks got unknown kwargs: {extra_kwargs!r}") @@ -7950,10 +7949,10 @@ def list_compute_capacity_topology_compute_network_blocks(self, compute_capacity "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -7979,14 +7978,14 @@ def list_compute_capacity_topology_compute_network_blocks(self, compute_capacity "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8120,7 +8119,7 @@ def list_compute_clusters(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_clusters got unknown kwargs: {extra_kwargs!r}") @@ -8148,14 +8147,14 @@ def list_compute_clusters(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8271,7 +8270,7 @@ def list_compute_global_image_capability_schema_versions(self, compute_global_im "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_global_image_capability_schema_versions got unknown kwargs: {extra_kwargs!r}") @@ -8280,10 +8279,10 @@ def list_compute_global_image_capability_schema_versions(self, compute_global_im "computeGlobalImageCapabilitySchemaId": compute_global_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -8307,7 +8306,7 @@ def list_compute_global_image_capability_schema_versions(self, compute_global_im "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8431,7 +8430,7 @@ def list_compute_global_image_capability_schemas(self, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_global_image_capability_schemas got unknown kwargs: {extra_kwargs!r}") @@ -8458,7 +8457,7 @@ def list_compute_global_image_capability_schemas(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8586,7 +8585,7 @@ def list_compute_image_capability_schemas(self, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compute_image_capability_schemas got unknown kwargs: {extra_kwargs!r}") @@ -8614,7 +8613,7 @@ def list_compute_image_capability_schemas(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8750,7 +8749,7 @@ def list_console_histories(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_console_histories got unknown kwargs: {extra_kwargs!r}") @@ -8786,7 +8785,7 @@ def list_console_histories(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8899,7 +8898,7 @@ def list_dedicated_vm_host_instance_shapes(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_vm_host_instance_shapes got unknown kwargs: {extra_kwargs!r}") @@ -8911,14 +8910,14 @@ def list_dedicated_vm_host_instance_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9044,7 +9043,7 @@ def list_dedicated_vm_host_instances(self, compartment_id, dedicated_vm_host_id, "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_vm_host_instances got unknown kwargs: {extra_kwargs!r}") @@ -9053,10 +9052,10 @@ def list_dedicated_vm_host_instances(self, compartment_id, dedicated_vm_host_id, "dedicatedVmHostId": dedicated_vm_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -9081,14 +9080,14 @@ def list_dedicated_vm_host_instances(self, compartment_id, dedicated_vm_host_id, "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9197,7 +9196,7 @@ def list_dedicated_vm_host_shapes(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_vm_host_shapes got unknown kwargs: {extra_kwargs!r}") @@ -9209,14 +9208,14 @@ def list_dedicated_vm_host_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9364,7 +9363,7 @@ def list_dedicated_vm_hosts(self, compartment_id, **kwargs): "remaining_memory_in_gbs_greater_than_or_equal_to", "remaining_ocpus_greater_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_vm_hosts got unknown kwargs: {extra_kwargs!r}") @@ -9403,14 +9402,14 @@ def list_dedicated_vm_hosts(self, compartment_id, **kwargs): "remainingMemoryInGBsGreaterThanOrEqualTo": kwargs.get("remaining_memory_in_gbs_greater_than_or_equal_to", missing), "remainingOcpusGreaterThanOrEqualTo": kwargs.get("remaining_ocpus_greater_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9507,7 +9506,7 @@ def list_image_shape_compatibility_entries(self, image_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_image_shape_compatibility_entries got unknown kwargs: {extra_kwargs!r}") @@ -9516,24 +9515,24 @@ def list_image_shape_compatibility_entries(self, image_id, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9689,7 +9688,7 @@ def list_images(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_images got unknown kwargs: {extra_kwargs!r}") @@ -9727,7 +9726,7 @@ def list_images(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9834,7 +9833,7 @@ def list_instance_console_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_console_connections got unknown kwargs: {extra_kwargs!r}") @@ -9845,7 +9844,7 @@ def list_instance_console_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9975,7 +9974,7 @@ def list_instance_devices(self, instance_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_devices got unknown kwargs: {extra_kwargs!r}") @@ -9984,10 +9983,10 @@ def list_instance_devices(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -10012,14 +10011,14 @@ def list_instance_devices(self, instance_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10168,7 +10167,7 @@ def list_instances(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instances got unknown kwargs: {extra_kwargs!r}") @@ -10206,7 +10205,7 @@ def list_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", @@ -10316,7 +10315,7 @@ def list_shapes(self, compartment_id, **kwargs): "page", "image_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shapes got unknown kwargs: {extra_kwargs!r}") @@ -10328,7 +10327,7 @@ def list_shapes(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "imageId": kwargs.get("image_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10441,7 +10440,7 @@ def list_vnic_attachments(self, compartment_id, **kwargs): "page", "vnic_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vnic_attachments got unknown kwargs: {extra_kwargs!r}") @@ -10454,7 +10453,7 @@ def list_vnic_attachments(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "vnicId": kwargs.get("vnic_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", @@ -10569,7 +10568,7 @@ def list_volume_attachments(self, compartment_id, **kwargs): "instance_id", "volume_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_volume_attachments got unknown kwargs: {extra_kwargs!r}") @@ -10582,7 +10581,7 @@ def list_volume_attachments(self, compartment_id, **kwargs): "instanceId": kwargs.get("instance_id", missing), "volumeId": kwargs.get("volume_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/x-json-stream", @@ -10660,7 +10659,7 @@ def remove_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs) api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ImageShapeCompatibilityEntry/RemoveImageShapeCompatibilityEntry" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_image_shape_compatibility_entry got unknown kwargs: {extra_kwargs!r}") @@ -10670,10 +10669,10 @@ def remove_image_shape_compatibility_entry(self, image_id, shape_name, **kwargs) "shapeName": shape_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10779,7 +10778,7 @@ def terminate_instance(self, instance_id, **kwargs): "preserve_boot_volume", "preserve_data_volumes_created_at_launch" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_instance got unknown kwargs: {extra_kwargs!r}") @@ -10788,24 +10787,24 @@ def terminate_instance(self, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "preserveBootVolume": kwargs.get("preserve_boot_volume", missing), "preserveDataVolumesCreatedAtLaunch": kwargs.get("preserve_data_volumes_created_at_launch", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10893,7 +10892,7 @@ def update_compute_capacity_reservation(self, capacity_reservation_id, update_co "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compute_capacity_reservation got unknown kwargs: {extra_kwargs!r}") @@ -10902,10 +10901,10 @@ def update_compute_capacity_reservation(self, capacity_reservation_id, update_co "capacityReservationId": capacity_reservation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10914,7 +10913,7 @@ def update_compute_capacity_reservation(self, capacity_reservation_id, update_co "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11002,7 +11001,7 @@ def update_compute_capacity_topology(self, compute_capacity_topology_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compute_capacity_topology got unknown kwargs: {extra_kwargs!r}") @@ -11011,10 +11010,10 @@ def update_compute_capacity_topology(self, compute_capacity_topology_id, update_ "computeCapacityTopologyId": compute_capacity_topology_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11023,7 +11022,7 @@ def update_compute_capacity_topology(self, compute_capacity_topology_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11133,7 +11132,7 @@ def update_compute_cluster(self, compute_cluster_id, update_compute_cluster_deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compute_cluster got unknown kwargs: {extra_kwargs!r}") @@ -11142,10 +11141,10 @@ def update_compute_cluster(self, compute_cluster_id, update_compute_cluster_deta "computeClusterId": compute_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11155,7 +11154,7 @@ def update_compute_cluster(self, compute_cluster_id, update_compute_cluster_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11239,7 +11238,7 @@ def update_compute_image_capability_schema(self, compute_image_capability_schema "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compute_image_capability_schema got unknown kwargs: {extra_kwargs!r}") @@ -11248,10 +11247,10 @@ def update_compute_image_capability_schema(self, compute_image_capability_schema "computeImageCapabilitySchemaId": compute_image_capability_schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11259,7 +11258,7 @@ def update_compute_image_capability_schema(self, compute_image_capability_schema "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11342,7 +11341,7 @@ def update_console_history(self, instance_console_history_id, update_console_his "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_console_history got unknown kwargs: {extra_kwargs!r}") @@ -11351,10 +11350,10 @@ def update_console_history(self, instance_console_history_id, update_console_his "instanceConsoleHistoryId": instance_console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11362,7 +11361,7 @@ def update_console_history(self, instance_console_history_id, update_console_his "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11459,7 +11458,7 @@ def update_dedicated_vm_host(self, dedicated_vm_host_id, update_dedicated_vm_hos "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dedicated_vm_host got unknown kwargs: {extra_kwargs!r}") @@ -11468,10 +11467,10 @@ def update_dedicated_vm_host(self, dedicated_vm_host_id, update_dedicated_vm_hos "dedicatedVmHostId": dedicated_vm_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11481,7 +11480,7 @@ def update_dedicated_vm_host(self, dedicated_vm_host_id, update_dedicated_vm_hos "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11575,7 +11574,7 @@ def update_image(self, image_id, update_image_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_image got unknown kwargs: {extra_kwargs!r}") @@ -11584,10 +11583,10 @@ def update_image(self, image_id, update_image_details, **kwargs): "imageId": image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11596,7 +11595,7 @@ def update_image(self, image_id, update_image_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11696,7 +11695,7 @@ def update_instance(self, instance_id, update_instance_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_instance got unknown kwargs: {extra_kwargs!r}") @@ -11705,10 +11704,10 @@ def update_instance(self, instance_id, update_instance_details, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11717,7 +11716,7 @@ def update_instance(self, instance_id, update_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11806,7 +11805,7 @@ def update_instance_console_connection(self, instance_console_connection_id, upd "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_instance_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -11815,10 +11814,10 @@ def update_instance_console_connection(self, instance_console_connection_id, upd "instanceConsoleConnectionId": instance_console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11827,7 +11826,7 @@ def update_instance_console_connection(self, instance_console_connection_id, upd "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11915,7 +11914,7 @@ def update_volume_attachment(self, volume_attachment_id, update_volume_attachmen "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_volume_attachment got unknown kwargs: {extra_kwargs!r}") @@ -11924,10 +11923,10 @@ def update_volume_attachment(self, volume_attachment_id, update_volume_attachmen "volumeAttachmentId": volume_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11936,7 +11935,7 @@ def update_volume_attachment(self, volume_attachment_id, update_volume_attachmen "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/core/compute_management_client.py b/src/oci/core/compute_management_client.py index ad29568164..948a6ee232 100644 --- a/src/oci/core/compute_management_client.py +++ b/src/oci/core/compute_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def attach_instance_pool_instance(self, instance_pool_id, attach_instance_pool_i "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_instance_pool_instance got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def attach_instance_pool_instance(self, instance_pool_id, attach_instance_pool_i "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def attach_instance_pool_instance(self, instance_pool_id, attach_instance_pool_i "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -293,7 +292,7 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -302,10 +301,10 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -314,7 +313,7 @@ def attach_load_balancer(self, instance_pool_id, attach_load_balancer_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -422,7 +421,7 @@ def change_cluster_network_compartment(self, cluster_network_id, change_cluster_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cluster_network_compartment got unknown kwargs: {extra_kwargs!r}") @@ -431,10 +430,10 @@ def change_cluster_network_compartment(self, cluster_network_id, change_cluster_ "clusterNetworkId": cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -444,7 +443,7 @@ def change_cluster_network_compartment(self, cluster_network_id, change_cluster_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -554,7 +553,7 @@ def change_instance_configuration_compartment(self, instance_configuration_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_instance_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -563,10 +562,10 @@ def change_instance_configuration_compartment(self, instance_configuration_id, c "instanceConfigurationId": instance_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -576,7 +575,7 @@ def change_instance_configuration_compartment(self, instance_configuration_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -680,7 +679,7 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_instance_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -689,10 +688,10 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -702,7 +701,7 @@ def change_instance_pool_compartment(self, instance_pool_id, change_instance_poo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -799,7 +798,7 @@ def create_cluster_network(self, create_cluster_network_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -809,7 +808,7 @@ def create_cluster_network(self, create_cluster_network_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -891,7 +890,7 @@ def create_instance_configuration(self, create_instance_configuration, **kwargs) "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -901,7 +900,7 @@ def create_instance_configuration(self, create_instance_configuration, **kwargs) "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -986,7 +985,7 @@ def create_instance_pool(self, create_instance_pool_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -996,7 +995,7 @@ def create_instance_pool(self, create_instance_pool_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1075,7 +1074,7 @@ def delete_instance_configuration(self, instance_configuration_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1084,10 +1083,10 @@ def delete_instance_configuration(self, instance_configuration_id, **kwargs): "instanceConfigurationId": instance_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1095,7 +1094,7 @@ def delete_instance_configuration(self, instance_configuration_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1178,7 +1177,7 @@ def detach_instance_pool_instance(self, instance_pool_id, detach_instance_pool_i "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_instance_pool_instance got unknown kwargs: {extra_kwargs!r}") @@ -1187,10 +1186,10 @@ def detach_instance_pool_instance(self, instance_pool_id, detach_instance_pool_i "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1198,7 +1197,7 @@ def detach_instance_pool_instance(self, instance_pool_id, detach_instance_pool_i "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1290,7 +1289,7 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -1299,10 +1298,10 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1311,7 +1310,7 @@ def detach_load_balancer(self, instance_pool_id, detach_load_balancer_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1386,7 +1385,7 @@ def get_cluster_network(self, cluster_network_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ClusterNetwork/GetClusterNetwork" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -1395,10 +1394,10 @@ def get_cluster_network(self, cluster_network_id, **kwargs): "clusterNetworkId": cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1472,7 +1471,7 @@ def get_instance_configuration(self, instance_configuration_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstanceConfiguration/GetInstanceConfiguration" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1481,10 +1480,10 @@ def get_instance_configuration(self, instance_configuration_id, **kwargs): "instanceConfigurationId": instance_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1560,7 +1559,7 @@ def get_instance_pool(self, instance_pool_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstancePool/GetInstancePool" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -1569,10 +1568,10 @@ def get_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1653,7 +1652,7 @@ def get_instance_pool_instance(self, instance_pool_id, instance_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstancePoolInstance/GetInstancePoolInstance" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_pool_instance got unknown kwargs: {extra_kwargs!r}") @@ -1663,10 +1662,10 @@ def get_instance_pool_instance(self, instance_pool_id, instance_id, **kwargs): "instanceId": instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1745,7 +1744,7 @@ def get_instance_pool_load_balancer_attachment(self, instance_pool_id, instance_ api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InstancePoolLoadBalancerAttachment/GetInstancePoolLoadBalancerAttachment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_instance_pool_load_balancer_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1755,10 +1754,10 @@ def get_instance_pool_load_balancer_attachment(self, instance_pool_id, instance_ "instancePoolLoadBalancerAttachmentId": instance_pool_load_balancer_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1857,7 +1856,7 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"launch_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1866,10 +1865,10 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf "instanceConfigurationId": instance_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1877,7 +1876,7 @@ def launch_instance_configuration(self, instance_configuration_id, instance_conf "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2003,7 +2002,7 @@ def list_cluster_network_instances(self, compartment_id, cluster_network_id, **k "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cluster_network_instances got unknown kwargs: {extra_kwargs!r}") @@ -2012,10 +2011,10 @@ def list_cluster_network_instances(self, compartment_id, cluster_network_id, **k "clusterNetworkId": cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2040,7 +2039,7 @@ def list_cluster_network_instances(self, compartment_id, cluster_network_id, **k "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2173,7 +2172,7 @@ def list_cluster_networks(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cluster_networks got unknown kwargs: {extra_kwargs!r}") @@ -2208,7 +2207,7 @@ def list_cluster_networks(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2325,7 +2324,7 @@ def list_instance_configurations(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2351,7 +2350,7 @@ def list_instance_configurations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2477,7 +2476,7 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_pool_instances got unknown kwargs: {extra_kwargs!r}") @@ -2486,10 +2485,10 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2514,7 +2513,7 @@ def list_instance_pool_instances(self, compartment_id, instance_pool_id, **kwarg "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2644,7 +2643,7 @@ def list_instance_pools(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_instance_pools got unknown kwargs: {extra_kwargs!r}") @@ -2679,7 +2678,7 @@ def list_instance_pools(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2773,7 +2772,7 @@ def reset_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -2782,10 +2781,10 @@ def reset_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2794,7 +2793,7 @@ def reset_instance_pool(self, instance_pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2887,7 +2886,7 @@ def softreset_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"softreset_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -2896,10 +2895,10 @@ def softreset_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2908,7 +2907,7 @@ def softreset_instance_pool(self, instance_pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3001,7 +3000,7 @@ def softstop_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"softstop_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -3010,10 +3009,10 @@ def softstop_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3022,7 +3021,7 @@ def softstop_instance_pool(self, instance_pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3112,7 +3111,7 @@ def start_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -3121,10 +3120,10 @@ def start_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3133,7 +3132,7 @@ def start_instance_pool(self, instance_pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3223,7 +3222,7 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -3232,10 +3231,10 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3244,7 +3243,7 @@ def stop_instance_pool(self, instance_pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3330,7 +3329,7 @@ def terminate_cluster_network(self, cluster_network_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -3339,10 +3338,10 @@ def terminate_cluster_network(self, cluster_network_id, **kwargs): "clusterNetworkId": cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3350,7 +3349,7 @@ def terminate_cluster_network(self, cluster_network_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3435,7 +3434,7 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -3444,10 +3443,10 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3455,7 +3454,7 @@ def terminate_instance_pool(self, instance_pool_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3547,7 +3546,7 @@ def update_cluster_network(self, cluster_network_id, update_cluster_network_deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -3556,10 +3555,10 @@ def update_cluster_network(self, cluster_network_id, update_cluster_network_deta "clusterNetworkId": cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3568,7 +3567,7 @@ def update_cluster_network(self, cluster_network_id, update_cluster_network_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3660,7 +3659,7 @@ def update_instance_configuration(self, instance_configuration_id, update_instan "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_instance_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3669,10 +3668,10 @@ def update_instance_configuration(self, instance_configuration_id, update_instan "instanceConfigurationId": instance_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3681,7 +3680,7 @@ def update_instance_configuration(self, instance_configuration_id, update_instan "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3777,7 +3776,7 @@ def update_instance_pool(self, instance_pool_id, update_instance_pool_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_instance_pool got unknown kwargs: {extra_kwargs!r}") @@ -3786,10 +3785,10 @@ def update_instance_pool(self, instance_pool_id, update_instance_pool_details, * "instancePoolId": instance_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3798,7 +3797,7 @@ def update_instance_pool(self, instance_pool_id, update_instance_pool_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/core/virtual_network_client.py b/src/oci/core/virtual_network_client.py index 810d2073ac..30a77fd03b 100644 --- a/src/oci/core/virtual_network_client.py +++ b/src/oci/core/virtual_network_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -163,7 +162,7 @@ def add_drg_route_distribution_statements(self, drg_route_distribution_id, add_d api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteDistributionStatement/AddDrgRouteDistributionStatements" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_drg_route_distribution_statements got unknown kwargs: {extra_kwargs!r}") @@ -172,10 +171,10 @@ def add_drg_route_distribution_statements(self, drg_route_distribution_id, add_d "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -268,7 +267,7 @@ def add_drg_route_rules(self, drg_route_table_id, add_drg_route_rules_details, * "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_drg_route_rules got unknown kwargs: {extra_kwargs!r}") @@ -277,10 +276,10 @@ def add_drg_route_rules(self, drg_route_table_id, add_drg_route_rules_details, * "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -288,7 +287,7 @@ def add_drg_route_rules(self, drg_route_table_id, add_drg_route_rules_details, * "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -387,7 +386,7 @@ def add_ipv6_subnet_cidr(self, subnet_id, add_subnet_ipv6_cidr_details, **kwargs "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_ipv6_subnet_cidr got unknown kwargs: {extra_kwargs!r}") @@ -396,10 +395,10 @@ def add_ipv6_subnet_cidr(self, subnet_id, add_subnet_ipv6_cidr_details, **kwargs "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -409,7 +408,7 @@ def add_ipv6_subnet_cidr(self, subnet_id, add_subnet_ipv6_cidr_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -508,7 +507,7 @@ def add_ipv6_vcn_cidr(self, vcn_id, **kwargs): "if_match", "add_vcn_ipv6_cidr_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_ipv6_vcn_cidr got unknown kwargs: {extra_kwargs!r}") @@ -517,10 +516,10 @@ def add_ipv6_vcn_cidr(self, vcn_id, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def add_ipv6_vcn_cidr(self, vcn_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -604,7 +603,7 @@ def add_network_security_group_security_rules(self, network_security_group_id, a api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/SecurityRule/AddNetworkSecurityGroupSecurityRules" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_network_security_group_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -613,10 +612,10 @@ def add_network_security_group_security_rules(self, network_security_group_id, a "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -716,7 +715,7 @@ def add_public_ip_pool_capacity(self, public_ip_pool_id, add_public_ip_pool_capa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_public_ip_pool_capacity got unknown kwargs: {extra_kwargs!r}") @@ -725,10 +724,10 @@ def add_public_ip_pool_capacity(self, public_ip_pool_id, add_public_ip_pool_capa "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -737,7 +736,7 @@ def add_public_ip_pool_capacity(self, public_ip_pool_id, add_public_ip_pool_capa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -842,7 +841,7 @@ def add_vcn_cidr(self, vcn_id, add_vcn_cidr_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_vcn_cidr got unknown kwargs: {extra_kwargs!r}") @@ -851,10 +850,10 @@ def add_vcn_cidr(self, vcn_id, add_vcn_cidr_details, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -864,7 +863,7 @@ def add_vcn_cidr(self, vcn_id, add_vcn_cidr_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -945,7 +944,7 @@ def advertise_byoip_range(self, byoip_range_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"advertise_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -954,10 +953,10 @@ def advertise_byoip_range(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -965,7 +964,7 @@ def advertise_byoip_range(self, byoip_range_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1055,7 +1054,7 @@ def attach_service_id(self, service_gateway_id, attach_service_details, **kwargs "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_service_id got unknown kwargs: {extra_kwargs!r}") @@ -1064,10 +1063,10 @@ def attach_service_id(self, service_gateway_id, attach_service_details, **kwargs "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1075,7 +1074,7 @@ def attach_service_id(self, service_gateway_id, attach_service_details, **kwargs "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1153,7 +1152,7 @@ def bulk_add_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_add_ api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VirtualCircuitPublicPrefix/BulkAddVirtualCircuitPublicPrefixes" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_add_virtual_circuit_public_prefixes got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def bulk_add_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_add_ "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1249,7 +1248,7 @@ def bulk_delete_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_d api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VirtualCircuitPublicPrefix/BulkDeleteVirtualCircuitPublicPrefixes" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_delete_virtual_circuit_public_prefixes got unknown kwargs: {extra_kwargs!r}") @@ -1258,10 +1257,10 @@ def bulk_delete_virtual_circuit_public_prefixes(self, virtual_circuit_id, bulk_d "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1363,7 +1362,7 @@ def change_byoip_range_compartment(self, byoip_range_id, change_byoip_range_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_byoip_range_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1372,10 +1371,10 @@ def change_byoip_range_compartment(self, byoip_range_id, change_byoip_range_comp "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1384,7 +1383,7 @@ def change_byoip_range_compartment(self, byoip_range_id, change_byoip_range_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1485,7 +1484,7 @@ def change_capture_filter_compartment(self, capture_filter_id, change_capture_fi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_capture_filter_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1494,10 +1493,10 @@ def change_capture_filter_compartment(self, capture_filter_id, change_capture_fi "captureFilterId": capture_filter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1507,7 +1506,7 @@ def change_capture_filter_compartment(self, capture_filter_id, change_capture_fi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1602,7 +1601,7 @@ def change_cpe_compartment(self, cpe_id, change_cpe_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cpe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1611,10 +1610,10 @@ def change_cpe_compartment(self, cpe_id, change_cpe_compartment_details, **kwarg "cpeId": cpe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1623,7 +1622,7 @@ def change_cpe_compartment(self, cpe_id, change_cpe_compartment_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1720,7 +1719,7 @@ def change_cross_connect_compartment(self, cross_connect_id, change_cross_connec "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cross_connect_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1729,10 +1728,10 @@ def change_cross_connect_compartment(self, cross_connect_id, change_cross_connec "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1741,7 +1740,7 @@ def change_cross_connect_compartment(self, cross_connect_id, change_cross_connec "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1838,7 +1837,7 @@ def change_cross_connect_group_compartment(self, cross_connect_group_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cross_connect_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1847,10 +1846,10 @@ def change_cross_connect_group_compartment(self, cross_connect_group_id, change_ "crossConnectGroupId": cross_connect_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1859,7 +1858,7 @@ def change_cross_connect_group_compartment(self, cross_connect_group_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1956,7 +1955,7 @@ def change_dhcp_options_compartment(self, dhcp_id, change_dhcp_options_compartme "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dhcp_options_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1965,10 +1964,10 @@ def change_dhcp_options_compartment(self, dhcp_id, change_dhcp_options_compartme "dhcpId": dhcp_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1977,7 +1976,7 @@ def change_dhcp_options_compartment(self, dhcp_id, change_dhcp_options_compartme "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2072,7 +2071,7 @@ def change_drg_compartment(self, drg_id, change_drg_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_drg_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2081,10 +2080,10 @@ def change_drg_compartment(self, drg_id, change_drg_compartment_details, **kwarg "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2093,7 +2092,7 @@ def change_drg_compartment(self, drg_id, change_drg_compartment_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2188,7 +2187,7 @@ def change_internet_gateway_compartment(self, ig_id, change_internet_gateway_com "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_internet_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2197,10 +2196,10 @@ def change_internet_gateway_compartment(self, ig_id, change_internet_gateway_com "igId": ig_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2209,7 +2208,7 @@ def change_internet_gateway_compartment(self, ig_id, change_internet_gateway_com "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2304,7 +2303,7 @@ def change_ip_sec_connection_compartment(self, ipsc_id, change_ip_sec_connection "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ip_sec_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2313,10 +2312,10 @@ def change_ip_sec_connection_compartment(self, ipsc_id, change_ip_sec_connection "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2325,7 +2324,7 @@ def change_ip_sec_connection_compartment(self, ipsc_id, change_ip_sec_connection "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2422,7 +2421,7 @@ def change_local_peering_gateway_compartment(self, local_peering_gateway_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_local_peering_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2431,10 +2430,10 @@ def change_local_peering_gateway_compartment(self, local_peering_gateway_id, cha "localPeeringGatewayId": local_peering_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2443,7 +2442,7 @@ def change_local_peering_gateway_compartment(self, local_peering_gateway_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2538,7 +2537,7 @@ def change_nat_gateway_compartment(self, nat_gateway_id, change_nat_gateway_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_nat_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2547,10 +2546,10 @@ def change_nat_gateway_compartment(self, nat_gateway_id, change_nat_gateway_comp "natGatewayId": nat_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2559,7 +2558,7 @@ def change_nat_gateway_compartment(self, nat_gateway_id, change_nat_gateway_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2653,7 +2652,7 @@ def change_network_security_group_compartment(self, network_security_group_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_network_security_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2662,10 +2661,10 @@ def change_network_security_group_compartment(self, network_security_group_id, c "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2674,7 +2673,7 @@ def change_network_security_group_compartment(self, network_security_group_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2772,7 +2771,7 @@ def change_public_ip_compartment(self, public_ip_id, change_public_ip_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_public_ip_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2781,10 +2780,10 @@ def change_public_ip_compartment(self, public_ip_id, change_public_ip_compartmen "publicIpId": public_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2793,7 +2792,7 @@ def change_public_ip_compartment(self, public_ip_id, change_public_ip_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2888,7 +2887,7 @@ def change_public_ip_pool_compartment(self, public_ip_pool_id, change_public_ip_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_public_ip_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2897,10 +2896,10 @@ def change_public_ip_pool_compartment(self, public_ip_pool_id, change_public_ip_ "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2909,7 +2908,7 @@ def change_public_ip_pool_compartment(self, public_ip_pool_id, change_public_ip_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3004,7 +3003,7 @@ def change_remote_peering_connection_compartment(self, remote_peering_connection "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_remote_peering_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3013,10 +3012,10 @@ def change_remote_peering_connection_compartment(self, remote_peering_connection "remotePeeringConnectionId": remote_peering_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3025,7 +3024,7 @@ def change_remote_peering_connection_compartment(self, remote_peering_connection "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3122,7 +3121,7 @@ def change_route_table_compartment(self, rt_id, change_route_table_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_route_table_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3131,10 +3130,10 @@ def change_route_table_compartment(self, rt_id, change_route_table_compartment_d "rtId": rt_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3143,7 +3142,7 @@ def change_route_table_compartment(self, rt_id, change_route_table_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3238,7 +3237,7 @@ def change_security_list_compartment(self, security_list_id, change_security_lis "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_list_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3247,10 +3246,10 @@ def change_security_list_compartment(self, security_list_id, change_security_lis "securityListId": security_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3259,7 +3258,7 @@ def change_security_list_compartment(self, security_list_id, change_security_lis "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3354,7 +3353,7 @@ def change_service_gateway_compartment(self, service_gateway_id, change_service_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_service_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3363,10 +3362,10 @@ def change_service_gateway_compartment(self, service_gateway_id, change_service_ "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3375,7 +3374,7 @@ def change_service_gateway_compartment(self, service_gateway_id, change_service_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3470,7 +3469,7 @@ def change_subnet_compartment(self, subnet_id, change_subnet_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_subnet_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3479,10 +3478,10 @@ def change_subnet_compartment(self, subnet_id, change_subnet_compartment_details "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3491,7 +3490,7 @@ def change_subnet_compartment(self, subnet_id, change_subnet_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3586,7 +3585,7 @@ def change_vcn_compartment(self, vcn_id, change_vcn_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vcn_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3595,10 +3594,10 @@ def change_vcn_compartment(self, vcn_id, change_vcn_compartment_details, **kwarg "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3607,7 +3606,7 @@ def change_vcn_compartment(self, vcn_id, change_vcn_compartment_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3702,7 +3701,7 @@ def change_virtual_circuit_compartment(self, virtual_circuit_id, change_virtual_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_virtual_circuit_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3711,10 +3710,10 @@ def change_virtual_circuit_compartment(self, virtual_circuit_id, change_virtual_ "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3723,7 +3722,7 @@ def change_virtual_circuit_compartment(self, virtual_circuit_id, change_virtual_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3826,7 +3825,7 @@ def change_vlan_compartment(self, vlan_id, change_vlan_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vlan_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3835,10 +3834,10 @@ def change_vlan_compartment(self, vlan_id, change_vlan_compartment_details, **kw "vlanId": vlan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3848,7 +3847,7 @@ def change_vlan_compartment(self, vlan_id, change_vlan_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3949,7 +3948,7 @@ def change_vtap_compartment(self, vtap_id, change_vtap_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vtap_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3958,10 +3957,10 @@ def change_vtap_compartment(self, vtap_id, change_vtap_compartment_details, **kw "vtapId": vtap_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3971,7 +3970,7 @@ def change_vtap_compartment(self, vtap_id, change_vtap_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4054,7 +4053,7 @@ def connect_local_peering_gateways(self, local_peering_gateway_id, connect_local api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/LocalPeeringGateway/ConnectLocalPeeringGateways" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"connect_local_peering_gateways got unknown kwargs: {extra_kwargs!r}") @@ -4063,10 +4062,10 @@ def connect_local_peering_gateways(self, local_peering_gateway_id, connect_local "localPeeringGatewayId": local_peering_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4154,7 +4153,7 @@ def connect_remote_peering_connections(self, remote_peering_connection_id, conne api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/RemotePeeringConnection/ConnectRemotePeeringConnections" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"connect_remote_peering_connections got unknown kwargs: {extra_kwargs!r}") @@ -4163,10 +4162,10 @@ def connect_remote_peering_connections(self, remote_peering_connection_id, conne "remotePeeringConnectionId": remote_peering_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4259,7 +4258,7 @@ def create_byoip_range(self, create_byoip_range_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -4270,7 +4269,7 @@ def create_byoip_range(self, create_byoip_range_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4368,7 +4367,7 @@ def create_capture_filter(self, create_capture_filter_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_capture_filter got unknown kwargs: {extra_kwargs!r}") @@ -4379,7 +4378,7 @@ def create_capture_filter(self, create_capture_filter_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4480,7 +4479,7 @@ def create_cpe(self, create_cpe_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cpe got unknown kwargs: {extra_kwargs!r}") @@ -4490,7 +4489,7 @@ def create_cpe(self, create_cpe_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4596,7 +4595,7 @@ def create_cross_connect(self, create_cross_connect_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cross_connect got unknown kwargs: {extra_kwargs!r}") @@ -4606,7 +4605,7 @@ def create_cross_connect(self, create_cross_connect_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4708,7 +4707,7 @@ def create_cross_connect_group(self, create_cross_connect_group_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cross_connect_group got unknown kwargs: {extra_kwargs!r}") @@ -4718,7 +4717,7 @@ def create_cross_connect_group(self, create_cross_connect_group_details, **kwarg "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4816,7 +4815,7 @@ def create_dhcp_options(self, create_dhcp_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dhcp_options got unknown kwargs: {extra_kwargs!r}") @@ -4826,7 +4825,7 @@ def create_dhcp_options(self, create_dhcp_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4923,7 +4922,7 @@ def create_drg(self, create_drg_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_drg got unknown kwargs: {extra_kwargs!r}") @@ -4933,7 +4932,7 @@ def create_drg(self, create_drg_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5028,7 +5027,7 @@ def create_drg_attachment(self, create_drg_attachment_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_drg_attachment got unknown kwargs: {extra_kwargs!r}") @@ -5038,7 +5037,7 @@ def create_drg_attachment(self, create_drg_attachment_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5122,7 +5121,7 @@ def create_drg_route_distribution(self, create_drg_route_distribution_details, * "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -5132,7 +5131,7 @@ def create_drg_route_distribution(self, create_drg_route_distribution_details, * "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5214,7 +5213,7 @@ def create_drg_route_table(self, create_drg_route_table_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_drg_route_table got unknown kwargs: {extra_kwargs!r}") @@ -5224,7 +5223,7 @@ def create_drg_route_table(self, create_drg_route_table_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5328,7 +5327,7 @@ def create_internet_gateway(self, create_internet_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_internet_gateway got unknown kwargs: {extra_kwargs!r}") @@ -5338,7 +5337,7 @@ def create_internet_gateway(self, create_internet_gateway_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5451,7 +5450,7 @@ def create_ip_sec_connection(self, create_ip_sec_connection_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ip_sec_connection got unknown kwargs: {extra_kwargs!r}") @@ -5461,7 +5460,7 @@ def create_ip_sec_connection(self, create_ip_sec_connection_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5549,7 +5548,7 @@ def create_ipv6(self, create_ipv6_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ipv6 got unknown kwargs: {extra_kwargs!r}") @@ -5560,7 +5559,7 @@ def create_ipv6(self, create_ipv6_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5641,7 +5640,7 @@ def create_local_peering_gateway(self, create_local_peering_gateway_details, **k "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_local_peering_gateway got unknown kwargs: {extra_kwargs!r}") @@ -5651,7 +5650,7 @@ def create_local_peering_gateway(self, create_local_peering_gateway_details, **k "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5733,7 +5732,7 @@ def create_nat_gateway(self, create_nat_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_nat_gateway got unknown kwargs: {extra_kwargs!r}") @@ -5743,7 +5742,7 @@ def create_nat_gateway(self, create_nat_gateway_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5824,7 +5823,7 @@ def create_network_security_group(self, create_network_security_group_details, * "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_security_group got unknown kwargs: {extra_kwargs!r}") @@ -5834,7 +5833,7 @@ def create_network_security_group(self, create_network_security_group_details, * "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5919,7 +5918,7 @@ def create_private_ip(self, create_private_ip_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_ip got unknown kwargs: {extra_kwargs!r}") @@ -5929,7 +5928,7 @@ def create_private_ip(self, create_private_ip_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6033,7 +6032,7 @@ def create_public_ip(self, create_public_ip_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_public_ip got unknown kwargs: {extra_kwargs!r}") @@ -6043,7 +6042,7 @@ def create_public_ip(self, create_public_ip_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6129,7 +6128,7 @@ def create_public_ip_pool(self, create_public_ip_pool_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_public_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -6140,7 +6139,7 @@ def create_public_ip_pool(self, create_public_ip_pool_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6221,7 +6220,7 @@ def create_remote_peering_connection(self, create_remote_peering_connection_deta "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_remote_peering_connection got unknown kwargs: {extra_kwargs!r}") @@ -6231,7 +6230,7 @@ def create_remote_peering_connection(self, create_remote_peering_connection_deta "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6334,7 +6333,7 @@ def create_route_table(self, create_route_table_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_route_table got unknown kwargs: {extra_kwargs!r}") @@ -6344,7 +6343,7 @@ def create_route_table(self, create_route_table_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6444,7 +6443,7 @@ def create_security_list(self, create_security_list_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_list got unknown kwargs: {extra_kwargs!r}") @@ -6454,7 +6453,7 @@ def create_security_list(self, create_security_list_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6547,7 +6546,7 @@ def create_service_gateway(self, create_service_gateway_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_gateway got unknown kwargs: {extra_kwargs!r}") @@ -6557,7 +6556,7 @@ def create_service_gateway(self, create_service_gateway_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6678,7 +6677,7 @@ def create_subnet(self, create_subnet_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_subnet got unknown kwargs: {extra_kwargs!r}") @@ -6688,7 +6687,7 @@ def create_subnet(self, create_subnet_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6810,7 +6809,7 @@ def create_vcn(self, create_vcn_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vcn got unknown kwargs: {extra_kwargs!r}") @@ -6820,7 +6819,7 @@ def create_vcn(self, create_vcn_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6927,7 +6926,7 @@ def create_virtual_circuit(self, create_virtual_circuit_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_virtual_circuit got unknown kwargs: {extra_kwargs!r}") @@ -6937,7 +6936,7 @@ def create_virtual_circuit(self, create_virtual_circuit_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7025,7 +7024,7 @@ def create_vlan(self, create_vlan_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vlan got unknown kwargs: {extra_kwargs!r}") @@ -7036,7 +7035,7 @@ def create_vlan(self, create_vlan_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7134,7 +7133,7 @@ def create_vtap(self, create_vtap_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vtap got unknown kwargs: {extra_kwargs!r}") @@ -7145,7 +7144,7 @@ def create_vtap(self, create_vtap_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7237,7 +7236,7 @@ def delete_byoip_range(self, byoip_range_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -7246,10 +7245,10 @@ def delete_byoip_range(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7258,7 +7257,7 @@ def delete_byoip_range(self, byoip_range_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7342,7 +7341,7 @@ def delete_capture_filter(self, capture_filter_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_capture_filter got unknown kwargs: {extra_kwargs!r}") @@ -7351,10 +7350,10 @@ def delete_capture_filter(self, capture_filter_id, **kwargs): "captureFilterId": capture_filter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7363,7 +7362,7 @@ def delete_capture_filter(self, capture_filter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7443,7 +7442,7 @@ def delete_cpe(self, cpe_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cpe got unknown kwargs: {extra_kwargs!r}") @@ -7452,10 +7451,10 @@ def delete_cpe(self, cpe_id, **kwargs): "cpeId": cpe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7463,7 +7462,7 @@ def delete_cpe(self, cpe_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7544,7 +7543,7 @@ def delete_cross_connect(self, cross_connect_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cross_connect got unknown kwargs: {extra_kwargs!r}") @@ -7553,10 +7552,10 @@ def delete_cross_connect(self, cross_connect_id, **kwargs): "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7564,7 +7563,7 @@ def delete_cross_connect(self, cross_connect_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7646,7 +7645,7 @@ def delete_cross_connect_group(self, cross_connect_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cross_connect_group got unknown kwargs: {extra_kwargs!r}") @@ -7655,10 +7654,10 @@ def delete_cross_connect_group(self, cross_connect_group_id, **kwargs): "crossConnectGroupId": cross_connect_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7666,7 +7665,7 @@ def delete_cross_connect_group(self, cross_connect_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7750,7 +7749,7 @@ def delete_dhcp_options(self, dhcp_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dhcp_options got unknown kwargs: {extra_kwargs!r}") @@ -7759,10 +7758,10 @@ def delete_dhcp_options(self, dhcp_id, **kwargs): "dhcpId": dhcp_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7770,7 +7769,7 @@ def delete_dhcp_options(self, dhcp_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7851,7 +7850,7 @@ def delete_drg(self, drg_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_drg got unknown kwargs: {extra_kwargs!r}") @@ -7860,10 +7859,10 @@ def delete_drg(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7871,7 +7870,7 @@ def delete_drg(self, drg_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7951,7 +7950,7 @@ def delete_drg_attachment(self, drg_attachment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_drg_attachment got unknown kwargs: {extra_kwargs!r}") @@ -7960,10 +7959,10 @@ def delete_drg_attachment(self, drg_attachment_id, **kwargs): "drgAttachmentId": drg_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7971,7 +7970,7 @@ def delete_drg_attachment(self, drg_attachment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8051,7 +8050,7 @@ def delete_drg_route_distribution(self, drg_route_distribution_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -8060,10 +8059,10 @@ def delete_drg_route_distribution(self, drg_route_distribution_id, **kwargs): "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8071,7 +8070,7 @@ def delete_drg_route_distribution(self, drg_route_distribution_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8149,7 +8148,7 @@ def delete_drg_route_table(self, drg_route_table_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_drg_route_table got unknown kwargs: {extra_kwargs!r}") @@ -8158,10 +8157,10 @@ def delete_drg_route_table(self, drg_route_table_id, **kwargs): "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8169,7 +8168,7 @@ def delete_drg_route_table(self, drg_route_table_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8251,7 +8250,7 @@ def delete_internet_gateway(self, ig_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_internet_gateway got unknown kwargs: {extra_kwargs!r}") @@ -8260,10 +8259,10 @@ def delete_internet_gateway(self, ig_id, **kwargs): "igId": ig_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8271,7 +8270,7 @@ def delete_internet_gateway(self, ig_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8356,7 +8355,7 @@ def delete_ip_sec_connection(self, ipsc_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ip_sec_connection got unknown kwargs: {extra_kwargs!r}") @@ -8365,10 +8364,10 @@ def delete_ip_sec_connection(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8376,7 +8375,7 @@ def delete_ip_sec_connection(self, ipsc_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8464,7 +8463,7 @@ def delete_ipv6(self, ipv6_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ipv6 got unknown kwargs: {extra_kwargs!r}") @@ -8473,10 +8472,10 @@ def delete_ipv6(self, ipv6_id, **kwargs): "ipv6Id": ipv6_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8485,7 +8484,7 @@ def delete_ipv6(self, ipv6_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8566,7 +8565,7 @@ def delete_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_local_peering_gateway got unknown kwargs: {extra_kwargs!r}") @@ -8575,10 +8574,10 @@ def delete_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "localPeeringGatewayId": local_peering_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8586,7 +8585,7 @@ def delete_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8668,7 +8667,7 @@ def delete_nat_gateway(self, nat_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_nat_gateway got unknown kwargs: {extra_kwargs!r}") @@ -8677,10 +8676,10 @@ def delete_nat_gateway(self, nat_gateway_id, **kwargs): "natGatewayId": nat_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8688,7 +8687,7 @@ def delete_nat_gateway(self, nat_gateway_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8775,7 +8774,7 @@ def delete_network_security_group(self, network_security_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_security_group got unknown kwargs: {extra_kwargs!r}") @@ -8784,10 +8783,10 @@ def delete_network_security_group(self, network_security_group_id, **kwargs): "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8795,7 +8794,7 @@ def delete_network_security_group(self, network_security_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8886,7 +8885,7 @@ def delete_private_ip(self, private_ip_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_ip got unknown kwargs: {extra_kwargs!r}") @@ -8895,10 +8894,10 @@ def delete_private_ip(self, private_ip_id, **kwargs): "privateIpId": private_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8906,7 +8905,7 @@ def delete_private_ip(self, private_ip_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9000,7 +8999,7 @@ def delete_public_ip(self, public_ip_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_public_ip got unknown kwargs: {extra_kwargs!r}") @@ -9009,10 +9008,10 @@ def delete_public_ip(self, public_ip_id, **kwargs): "publicIpId": public_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9020,7 +9019,7 @@ def delete_public_ip(self, public_ip_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9107,7 +9106,7 @@ def delete_public_ip_pool(self, public_ip_pool_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_public_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -9116,10 +9115,10 @@ def delete_public_ip_pool(self, public_ip_pool_id, **kwargs): "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9128,7 +9127,7 @@ def delete_public_ip_pool(self, public_ip_pool_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9209,7 +9208,7 @@ def delete_remote_peering_connection(self, remote_peering_connection_id, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_remote_peering_connection got unknown kwargs: {extra_kwargs!r}") @@ -9218,10 +9217,10 @@ def delete_remote_peering_connection(self, remote_peering_connection_id, **kwarg "remotePeeringConnectionId": remote_peering_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9229,7 +9228,7 @@ def delete_remote_peering_connection(self, remote_peering_connection_id, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9313,7 +9312,7 @@ def delete_route_table(self, rt_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_route_table got unknown kwargs: {extra_kwargs!r}") @@ -9322,10 +9321,10 @@ def delete_route_table(self, rt_id, **kwargs): "rtId": rt_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9333,7 +9332,7 @@ def delete_route_table(self, rt_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9415,7 +9414,7 @@ def delete_security_list(self, security_list_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_list got unknown kwargs: {extra_kwargs!r}") @@ -9424,10 +9423,10 @@ def delete_security_list(self, security_list_id, **kwargs): "securityListId": security_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9435,7 +9434,7 @@ def delete_security_list(self, security_list_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9514,7 +9513,7 @@ def delete_service_gateway(self, service_gateway_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_gateway got unknown kwargs: {extra_kwargs!r}") @@ -9523,10 +9522,10 @@ def delete_service_gateway(self, service_gateway_id, **kwargs): "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9534,7 +9533,7 @@ def delete_service_gateway(self, service_gateway_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9614,7 +9613,7 @@ def delete_subnet(self, subnet_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_subnet got unknown kwargs: {extra_kwargs!r}") @@ -9623,10 +9622,10 @@ def delete_subnet(self, subnet_id, **kwargs): "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9634,7 +9633,7 @@ def delete_subnet(self, subnet_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9717,7 +9716,7 @@ def delete_vcn(self, vcn_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vcn got unknown kwargs: {extra_kwargs!r}") @@ -9726,10 +9725,10 @@ def delete_vcn(self, vcn_id, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9737,7 +9736,7 @@ def delete_vcn(self, vcn_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9819,7 +9818,7 @@ def delete_virtual_circuit(self, virtual_circuit_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_virtual_circuit got unknown kwargs: {extra_kwargs!r}") @@ -9828,10 +9827,10 @@ def delete_virtual_circuit(self, virtual_circuit_id, **kwargs): "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9839,7 +9838,7 @@ def delete_virtual_circuit(self, virtual_circuit_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9924,7 +9923,7 @@ def delete_vlan(self, vlan_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vlan got unknown kwargs: {extra_kwargs!r}") @@ -9933,10 +9932,10 @@ def delete_vlan(self, vlan_id, **kwargs): "vlanId": vlan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9945,7 +9944,7 @@ def delete_vlan(self, vlan_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10029,7 +10028,7 @@ def delete_vtap(self, vtap_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vtap got unknown kwargs: {extra_kwargs!r}") @@ -10038,10 +10037,10 @@ def delete_vtap(self, vtap_id, **kwargs): "vtapId": vtap_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10050,7 +10049,7 @@ def delete_vtap(self, vtap_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10142,7 +10141,7 @@ def detach_service_id(self, service_gateway_id, detach_service_details, **kwargs "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_service_id got unknown kwargs: {extra_kwargs!r}") @@ -10151,10 +10150,10 @@ def detach_service_id(self, service_gateway_id, detach_service_details, **kwargs "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10162,7 +10161,7 @@ def detach_service_id(self, service_gateway_id, detach_service_details, **kwargs "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10271,7 +10270,7 @@ def get_all_drg_attachments(self, drg_id, **kwargs): "attachment_type", "is_cross_tenancy" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_all_drg_attachments got unknown kwargs: {extra_kwargs!r}") @@ -10280,10 +10279,10 @@ def get_all_drg_attachments(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attachment_type' in kwargs: @@ -10299,14 +10298,14 @@ def get_all_drg_attachments(self, drg_id, **kwargs): "attachmentType": kwargs.get("attachment_type", missing), "isCrossTenancy": kwargs.get("is_cross_tenancy", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10382,7 +10381,7 @@ def get_allowed_ike_ip_sec_parameters(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_allowed_ike_ip_sec_parameters got unknown kwargs: {extra_kwargs!r}") @@ -10392,7 +10391,7 @@ def get_allowed_ike_ip_sec_parameters(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10473,7 +10472,7 @@ def get_byoip_range(self, byoip_range_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -10482,10 +10481,10 @@ def get_byoip_range(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10493,7 +10492,7 @@ def get_byoip_range(self, byoip_range_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10572,7 +10571,7 @@ def get_capture_filter(self, capture_filter_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_capture_filter got unknown kwargs: {extra_kwargs!r}") @@ -10581,10 +10580,10 @@ def get_capture_filter(self, capture_filter_id, **kwargs): "captureFilterId": capture_filter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10592,7 +10591,7 @@ def get_capture_filter(self, capture_filter_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10662,7 +10661,7 @@ def get_cpe(self, cpe_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Cpe/GetCpe" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cpe got unknown kwargs: {extra_kwargs!r}") @@ -10671,10 +10670,10 @@ def get_cpe(self, cpe_id, **kwargs): "cpeId": cpe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10778,7 +10777,7 @@ def get_cpe_device_config_content(self, cpe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cpe_device_config_content got unknown kwargs: {extra_kwargs!r}") @@ -10787,10 +10786,10 @@ def get_cpe_device_config_content(self, cpe_id, **kwargs): "cpeId": cpe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10798,7 +10797,7 @@ def get_cpe_device_config_content(self, cpe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10887,7 +10886,7 @@ def get_cpe_device_shape(self, cpe_device_shape_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cpe_device_shape got unknown kwargs: {extra_kwargs!r}") @@ -10896,10 +10895,10 @@ def get_cpe_device_shape(self, cpe_device_shape_id, **kwargs): "cpeDeviceShapeId": cpe_device_shape_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10907,7 +10906,7 @@ def get_cpe_device_shape(self, cpe_device_shape_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10979,7 +10978,7 @@ def get_cross_connect(self, cross_connect_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/CrossConnect/GetCrossConnect" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cross_connect got unknown kwargs: {extra_kwargs!r}") @@ -10988,10 +10987,10 @@ def get_cross_connect(self, cross_connect_id, **kwargs): "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11069,7 +11068,7 @@ def get_cross_connect_group(self, cross_connect_group_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/CrossConnectGroup/GetCrossConnectGroup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cross_connect_group got unknown kwargs: {extra_kwargs!r}") @@ -11078,10 +11077,10 @@ def get_cross_connect_group(self, cross_connect_group_id, **kwargs): "crossConnectGroupId": cross_connect_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11159,7 +11158,7 @@ def get_cross_connect_letter_of_authority(self, cross_connect_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/LetterOfAuthority/GetCrossConnectLetterOfAuthority" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cross_connect_letter_of_authority got unknown kwargs: {extra_kwargs!r}") @@ -11168,10 +11167,10 @@ def get_cross_connect_letter_of_authority(self, cross_connect_id, **kwargs): "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11249,7 +11248,7 @@ def get_cross_connect_status(self, cross_connect_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/CrossConnectStatus/GetCrossConnectStatus" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cross_connect_status got unknown kwargs: {extra_kwargs!r}") @@ -11258,10 +11257,10 @@ def get_cross_connect_status(self, cross_connect_id, **kwargs): "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11339,7 +11338,7 @@ def get_dhcp_options(self, dhcp_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DhcpOptions/GetDhcpOptions" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dhcp_options got unknown kwargs: {extra_kwargs!r}") @@ -11348,10 +11347,10 @@ def get_dhcp_options(self, dhcp_id, **kwargs): "dhcpId": dhcp_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11427,7 +11426,7 @@ def get_drg(self, drg_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Drg/GetDrg" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drg got unknown kwargs: {extra_kwargs!r}") @@ -11436,10 +11435,10 @@ def get_drg(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11515,7 +11514,7 @@ def get_drg_attachment(self, drg_attachment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgAttachment/GetDrgAttachment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drg_attachment got unknown kwargs: {extra_kwargs!r}") @@ -11524,10 +11523,10 @@ def get_drg_attachment(self, drg_attachment_id, **kwargs): "drgAttachmentId": drg_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11615,7 +11614,7 @@ def get_drg_redundancy_status(self, drg_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drg_redundancy_status got unknown kwargs: {extra_kwargs!r}") @@ -11624,10 +11623,10 @@ def get_drg_redundancy_status(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11635,7 +11634,7 @@ def get_drg_redundancy_status(self, drg_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11707,7 +11706,7 @@ def get_drg_route_distribution(self, drg_route_distribution_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteDistribution/GetDrgRouteDistribution" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -11716,10 +11715,10 @@ def get_drg_route_distribution(self, drg_route_distribution_id, **kwargs): "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11795,7 +11794,7 @@ def get_drg_route_table(self, drg_route_table_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteTable/GetDrgRouteTable" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drg_route_table got unknown kwargs: {extra_kwargs!r}") @@ -11804,10 +11803,10 @@ def get_drg_route_table(self, drg_route_table_id, **kwargs): "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11886,7 +11885,7 @@ def get_fast_connect_provider_service(self, provider_service_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/FastConnectProviderService/GetFastConnectProviderService" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fast_connect_provider_service got unknown kwargs: {extra_kwargs!r}") @@ -11895,10 +11894,10 @@ def get_fast_connect_provider_service(self, provider_service_id, **kwargs): "providerServiceId": provider_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11983,7 +11982,7 @@ def get_fast_connect_provider_service_key(self, provider_service_id, provider_se api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/FastConnectProviderServiceKey/GetFastConnectProviderServiceKey" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fast_connect_provider_service_key got unknown kwargs: {extra_kwargs!r}") @@ -11993,10 +11992,10 @@ def get_fast_connect_provider_service_key(self, provider_service_id, provider_se "providerServiceKeyName": provider_service_key_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12074,7 +12073,7 @@ def get_internet_gateway(self, ig_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/InternetGateway/GetInternetGateway" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_internet_gateway got unknown kwargs: {extra_kwargs!r}") @@ -12083,10 +12082,10 @@ def get_internet_gateway(self, ig_id, **kwargs): "igId": ig_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12164,7 +12163,7 @@ def get_ip_sec_connection(self, ipsc_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnection/GetIpSecConnection" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection got unknown kwargs: {extra_kwargs!r}") @@ -12173,10 +12172,10 @@ def get_ip_sec_connection(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12257,7 +12256,7 @@ def get_ip_sec_connection_device_config(self, ipsc_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnectionDeviceConfig/GetIpSecConnectionDeviceConfig" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection_device_config got unknown kwargs: {extra_kwargs!r}") @@ -12266,10 +12265,10 @@ def get_ip_sec_connection_device_config(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12348,7 +12347,7 @@ def get_ip_sec_connection_device_status(self, ipsc_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnectionDeviceStatus/GetIpSecConnectionDeviceStatus" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection_device_status got unknown kwargs: {extra_kwargs!r}") @@ -12357,10 +12356,10 @@ def get_ip_sec_connection_device_status(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12445,7 +12444,7 @@ def get_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnectionTunnel/GetIpSecConnectionTunnel" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection_tunnel got unknown kwargs: {extra_kwargs!r}") @@ -12455,10 +12454,10 @@ def get_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, **kwargs): "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12541,7 +12540,7 @@ def get_ip_sec_connection_tunnel_error(self, ipsc_id, tunnel_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnectionTunnelErrorDetails/GetIpSecConnectionTunnelError" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection_tunnel_error got unknown kwargs: {extra_kwargs!r}") @@ -12551,10 +12550,10 @@ def get_ip_sec_connection_tunnel_error(self, ipsc_id, tunnel_id, **kwargs): "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12638,7 +12637,7 @@ def get_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, **kwarg api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/IPSecConnectionTunnelSharedSecret/GetIpSecConnectionTunnelSharedSecret" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ip_sec_connection_tunnel_shared_secret got unknown kwargs: {extra_kwargs!r}") @@ -12648,10 +12647,10 @@ def get_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, **kwarg "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12756,7 +12755,7 @@ def get_ipsec_cpe_device_config_content(self, ipsc_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ipsec_cpe_device_config_content got unknown kwargs: {extra_kwargs!r}") @@ -12765,10 +12764,10 @@ def get_ipsec_cpe_device_config_content(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12776,7 +12775,7 @@ def get_ipsec_cpe_device_config_content(self, ipsc_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12863,7 +12862,7 @@ def get_ipv6(self, ipv6_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ipv6 got unknown kwargs: {extra_kwargs!r}") @@ -12872,10 +12871,10 @@ def get_ipv6(self, ipv6_id, **kwargs): "ipv6Id": ipv6_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12883,7 +12882,7 @@ def get_ipv6(self, ipv6_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12953,7 +12952,7 @@ def get_local_peering_gateway(self, local_peering_gateway_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/LocalPeeringGateway/GetLocalPeeringGateway" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_local_peering_gateway got unknown kwargs: {extra_kwargs!r}") @@ -12962,10 +12961,10 @@ def get_local_peering_gateway(self, local_peering_gateway_id, **kwargs): "localPeeringGatewayId": local_peering_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13041,7 +13040,7 @@ def get_nat_gateway(self, nat_gateway_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/NatGateway/GetNatGateway" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_nat_gateway got unknown kwargs: {extra_kwargs!r}") @@ -13050,10 +13049,10 @@ def get_nat_gateway(self, nat_gateway_id, **kwargs): "natGatewayId": nat_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13135,7 +13134,7 @@ def get_network_security_group(self, network_security_group_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/NetworkSecurityGroup/GetNetworkSecurityGroup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_security_group got unknown kwargs: {extra_kwargs!r}") @@ -13144,10 +13143,10 @@ def get_network_security_group(self, network_security_group_id, **kwargs): "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13264,7 +13263,7 @@ def get_networking_topology(self, compartment_id, **kwargs): "if_none_match", "cache_control" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_networking_topology got unknown kwargs: {extra_kwargs!r}") @@ -13281,7 +13280,7 @@ def get_networking_topology(self, compartment_id, **kwargs): "accessLevel": kwargs.get("access_level", missing), "queryCompartmentSubtree": kwargs.get("query_compartment_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -13290,7 +13289,7 @@ def get_networking_topology(self, compartment_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "cache-control": kwargs.get("cache_control", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13366,7 +13365,7 @@ def get_private_ip(self, private_ip_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/PrivateIp/GetPrivateIp" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_ip got unknown kwargs: {extra_kwargs!r}") @@ -13375,10 +13374,10 @@ def get_private_ip(self, private_ip_id, **kwargs): "privateIpId": private_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13468,7 +13467,7 @@ def get_public_ip(self, public_ip_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/PublicIp/GetPublicIp" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_public_ip got unknown kwargs: {extra_kwargs!r}") @@ -13477,10 +13476,10 @@ def get_public_ip(self, public_ip_id, **kwargs): "publicIpId": public_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13560,7 +13559,7 @@ def get_public_ip_by_ip_address(self, get_public_ip_by_ip_address_details, **kwa api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/PublicIp/GetPublicIpByIpAddress" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_public_ip_by_ip_address got unknown kwargs: {extra_kwargs!r}") @@ -13650,7 +13649,7 @@ def get_public_ip_by_private_ip_id(self, get_public_ip_by_private_ip_id_details, api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/PublicIp/GetPublicIpByPrivateIpId" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_public_ip_by_private_ip_id got unknown kwargs: {extra_kwargs!r}") @@ -13739,7 +13738,7 @@ def get_public_ip_pool(self, public_ip_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_public_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -13748,10 +13747,10 @@ def get_public_ip_pool(self, public_ip_pool_id, **kwargs): "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13759,7 +13758,7 @@ def get_public_ip_pool(self, public_ip_pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13829,7 +13828,7 @@ def get_remote_peering_connection(self, remote_peering_connection_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/RemotePeeringConnection/GetRemotePeeringConnection" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_remote_peering_connection got unknown kwargs: {extra_kwargs!r}") @@ -13838,10 +13837,10 @@ def get_remote_peering_connection(self, remote_peering_connection_id, **kwargs): "remotePeeringConnectionId": remote_peering_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13919,7 +13918,7 @@ def get_route_table(self, rt_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/RouteTable/GetRouteTable" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_route_table got unknown kwargs: {extra_kwargs!r}") @@ -13928,10 +13927,10 @@ def get_route_table(self, rt_id, **kwargs): "rtId": rt_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14007,7 +14006,7 @@ def get_security_list(self, security_list_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/SecurityList/GetSecurityList" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_list got unknown kwargs: {extra_kwargs!r}") @@ -14016,10 +14015,10 @@ def get_security_list(self, security_list_id, **kwargs): "securityListId": security_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14095,7 +14094,7 @@ def get_service(self, service_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Service/GetService" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service got unknown kwargs: {extra_kwargs!r}") @@ -14104,10 +14103,10 @@ def get_service(self, service_id, **kwargs): "serviceId": service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14183,7 +14182,7 @@ def get_service_gateway(self, service_gateway_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/ServiceGateway/GetServiceGateway" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_gateway got unknown kwargs: {extra_kwargs!r}") @@ -14192,10 +14191,10 @@ def get_service_gateway(self, service_gateway_id, **kwargs): "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14271,7 +14270,7 @@ def get_subnet(self, subnet_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Subnet/GetSubnet" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subnet got unknown kwargs: {extra_kwargs!r}") @@ -14280,10 +14279,10 @@ def get_subnet(self, subnet_id, **kwargs): "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14405,7 +14404,7 @@ def get_subnet_topology(self, compartment_id, subnet_id, **kwargs): "if_none_match", "cache_control" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subnet_topology got unknown kwargs: {extra_kwargs!r}") @@ -14423,7 +14422,7 @@ def get_subnet_topology(self, compartment_id, subnet_id, **kwargs): "queryCompartmentSubtree": kwargs.get("query_compartment_subtree", missing), "subnetId": subnet_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -14432,7 +14431,7 @@ def get_subnet_topology(self, compartment_id, subnet_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "cache-control": kwargs.get("cache_control", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14520,7 +14519,7 @@ def get_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tunnel_cpe_device_config got unknown kwargs: {extra_kwargs!r}") @@ -14530,10 +14529,10 @@ def get_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, **kwargs): "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14541,7 +14540,7 @@ def get_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14644,7 +14643,7 @@ def get_tunnel_cpe_device_config_content(self, ipsc_id, tunnel_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tunnel_cpe_device_config_content got unknown kwargs: {extra_kwargs!r}") @@ -14654,10 +14653,10 @@ def get_tunnel_cpe_device_config_content(self, ipsc_id, tunnel_id, **kwargs): "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14665,7 +14664,7 @@ def get_tunnel_cpe_device_config_content(self, ipsc_id, tunnel_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14746,7 +14745,7 @@ def get_upgrade_status(self, drg_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_upgrade_status got unknown kwargs: {extra_kwargs!r}") @@ -14755,10 +14754,10 @@ def get_upgrade_status(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14766,7 +14765,7 @@ def get_upgrade_status(self, drg_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14836,7 +14835,7 @@ def get_vcn(self, vcn_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Vcn/GetVcn" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vcn got unknown kwargs: {extra_kwargs!r}") @@ -14845,10 +14844,10 @@ def get_vcn(self, vcn_id, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14933,7 +14932,7 @@ def get_vcn_dns_resolver_association(self, vcn_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vcn_dns_resolver_association got unknown kwargs: {extra_kwargs!r}") @@ -14942,10 +14941,10 @@ def get_vcn_dns_resolver_association(self, vcn_id, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14953,7 +14952,7 @@ def get_vcn_dns_resolver_association(self, vcn_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15069,7 +15068,7 @@ def get_vcn_topology(self, compartment_id, vcn_id, **kwargs): "if_none_match", "cache_control" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vcn_topology got unknown kwargs: {extra_kwargs!r}") @@ -15087,7 +15086,7 @@ def get_vcn_topology(self, compartment_id, vcn_id, **kwargs): "queryCompartmentSubtree": kwargs.get("query_compartment_subtree", missing), "vcnId": vcn_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15096,7 +15095,7 @@ def get_vcn_topology(self, compartment_id, vcn_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "cache-control": kwargs.get("cache_control", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15166,7 +15165,7 @@ def get_virtual_circuit(self, virtual_circuit_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/VirtualCircuit/GetVirtualCircuit" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_circuit got unknown kwargs: {extra_kwargs!r}") @@ -15175,10 +15174,10 @@ def get_virtual_circuit(self, virtual_circuit_id, **kwargs): "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15265,7 +15264,7 @@ def get_vlan(self, vlan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vlan got unknown kwargs: {extra_kwargs!r}") @@ -15274,10 +15273,10 @@ def get_vlan(self, vlan_id, **kwargs): "vlanId": vlan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15285,7 +15284,7 @@ def get_vlan(self, vlan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15360,7 +15359,7 @@ def get_vnic(self, vnic_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/Vnic/GetVnic" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vnic got unknown kwargs: {extra_kwargs!r}") @@ -15369,10 +15368,10 @@ def get_vnic(self, vnic_id, **kwargs): "vnicId": vnic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15457,7 +15456,7 @@ def get_vtap(self, vtap_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vtap got unknown kwargs: {extra_kwargs!r}") @@ -15466,10 +15465,10 @@ def get_vtap(self, vtap_id, **kwargs): "vtapId": vtap_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15477,7 +15476,7 @@ def get_vtap(self, vtap_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15545,7 +15544,7 @@ def list_allowed_peer_regions_for_remote_peering(self, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/PeerRegionForRemotePeering/ListAllowedPeerRegionsForRemotePeering" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_allowed_peer_regions_for_remote_peering got unknown kwargs: {extra_kwargs!r}") @@ -15651,7 +15650,7 @@ def list_byoip_allocated_ranges(self, byoip_range_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_byoip_allocated_ranges got unknown kwargs: {extra_kwargs!r}") @@ -15660,24 +15659,24 @@ def list_byoip_allocated_ranges(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15805,7 +15804,7 @@ def list_byoip_ranges(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_byoip_ranges got unknown kwargs: {extra_kwargs!r}") @@ -15833,14 +15832,14 @@ def list_byoip_ranges(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15974,7 +15973,7 @@ def list_capture_filters(self, compartment_id, **kwargs): "lifecycle_state", "filter_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_capture_filters got unknown kwargs: {extra_kwargs!r}") @@ -16017,14 +16016,14 @@ def list_capture_filters(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "filterType": kwargs.get("filter_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16130,7 +16129,7 @@ def list_cpe_device_shapes(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cpe_device_shapes got unknown kwargs: {extra_kwargs!r}") @@ -16139,14 +16138,14 @@ def list_cpe_device_shapes(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16240,7 +16239,7 @@ def list_cpes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cpes got unknown kwargs: {extra_kwargs!r}") @@ -16250,7 +16249,7 @@ def list_cpes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16380,7 +16379,7 @@ def list_cross_connect_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cross_connect_groups got unknown kwargs: {extra_kwargs!r}") @@ -16415,7 +16414,7 @@ def list_cross_connect_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16515,7 +16514,7 @@ def list_cross_connect_locations(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cross_connect_locations got unknown kwargs: {extra_kwargs!r}") @@ -16525,7 +16524,7 @@ def list_cross_connect_locations(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16612,7 +16611,7 @@ def list_cross_connect_mappings(self, virtual_circuit_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cross_connect_mappings got unknown kwargs: {extra_kwargs!r}") @@ -16621,10 +16620,10 @@ def list_cross_connect_mappings(self, virtual_circuit_id, **kwargs): "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16632,7 +16631,7 @@ def list_cross_connect_mappings(self, virtual_circuit_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16766,7 +16765,7 @@ def list_cross_connects(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cross_connects got unknown kwargs: {extra_kwargs!r}") @@ -16802,7 +16801,7 @@ def list_cross_connects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16903,7 +16902,7 @@ def list_crossconnect_port_speed_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_crossconnect_port_speed_shapes got unknown kwargs: {extra_kwargs!r}") @@ -16913,7 +16912,7 @@ def list_crossconnect_port_speed_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17052,7 +17051,7 @@ def list_dhcp_options(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dhcp_options got unknown kwargs: {extra_kwargs!r}") @@ -17088,7 +17087,7 @@ def list_dhcp_options(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17251,7 +17250,7 @@ def list_drg_attachments(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drg_attachments got unknown kwargs: {extra_kwargs!r}") @@ -17298,7 +17297,7 @@ def list_drg_attachments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17408,7 +17407,7 @@ def list_drg_route_distribution_statements(self, drg_route_distribution_id, **kw "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drg_route_distribution_statements got unknown kwargs: {extra_kwargs!r}") @@ -17417,10 +17416,10 @@ def list_drg_route_distribution_statements(self, drg_route_distribution_id, **kw "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17443,7 +17442,7 @@ def list_drg_route_distribution_statements(self, drg_route_distribution_id, **kw "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17576,7 +17575,7 @@ def list_drg_route_distributions(self, drg_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drg_route_distributions got unknown kwargs: {extra_kwargs!r}") @@ -17611,7 +17610,7 @@ def list_drg_route_distributions(self, drg_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17715,7 +17714,7 @@ def list_drg_route_rules(self, drg_route_table_id, **kwargs): "page", "route_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drg_route_rules got unknown kwargs: {extra_kwargs!r}") @@ -17724,10 +17723,10 @@ def list_drg_route_rules(self, drg_route_table_id, **kwargs): "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'route_type' in kwargs: @@ -17742,7 +17741,7 @@ def list_drg_route_rules(self, drg_route_table_id, **kwargs): "page": kwargs.get("page", missing), "routeType": kwargs.get("route_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17880,7 +17879,7 @@ def list_drg_route_tables(self, drg_id, **kwargs): "import_drg_route_distribution_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drg_route_tables got unknown kwargs: {extra_kwargs!r}") @@ -17916,7 +17915,7 @@ def list_drg_route_tables(self, drg_id, **kwargs): "importDrgRouteDistributionId": kwargs.get("import_drg_route_distribution_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18013,7 +18012,7 @@ def list_drgs(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drgs got unknown kwargs: {extra_kwargs!r}") @@ -18023,7 +18022,7 @@ def list_drgs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18129,7 +18128,7 @@ def list_fast_connect_provider_services(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fast_connect_provider_services got unknown kwargs: {extra_kwargs!r}") @@ -18139,7 +18138,7 @@ def list_fast_connect_provider_services(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18243,7 +18242,7 @@ def list_fast_connect_provider_virtual_circuit_bandwidth_shapes(self, provider_s "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fast_connect_provider_virtual_circuit_bandwidth_shapes got unknown kwargs: {extra_kwargs!r}") @@ -18252,17 +18251,17 @@ def list_fast_connect_provider_virtual_circuit_bandwidth_shapes(self, provider_s "providerServiceId": provider_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18401,7 +18400,7 @@ def list_internet_gateways(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_internet_gateways got unknown kwargs: {extra_kwargs!r}") @@ -18437,7 +18436,7 @@ def list_internet_gateways(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18547,7 +18546,7 @@ def list_ip_sec_connection_tunnel_routes(self, ipsc_id, tunnel_id, **kwargs): "page", "advertiser" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ip_sec_connection_tunnel_routes got unknown kwargs: {extra_kwargs!r}") @@ -18557,10 +18556,10 @@ def list_ip_sec_connection_tunnel_routes(self, ipsc_id, tunnel_id, **kwargs): "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'advertiser' in kwargs: @@ -18575,7 +18574,7 @@ def list_ip_sec_connection_tunnel_routes(self, ipsc_id, tunnel_id, **kwargs): "page": kwargs.get("page", missing), "advertiser": kwargs.get("advertiser", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18681,7 +18680,7 @@ def list_ip_sec_connection_tunnel_security_associations(self, ipsc_id, tunnel_id "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ip_sec_connection_tunnel_security_associations got unknown kwargs: {extra_kwargs!r}") @@ -18691,17 +18690,17 @@ def list_ip_sec_connection_tunnel_security_associations(self, ipsc_id, tunnel_id "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18802,7 +18801,7 @@ def list_ip_sec_connection_tunnels(self, ipsc_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ip_sec_connection_tunnels got unknown kwargs: {extra_kwargs!r}") @@ -18811,17 +18810,17 @@ def list_ip_sec_connection_tunnels(self, ipsc_id, **kwargs): "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18935,7 +18934,7 @@ def list_ip_sec_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ip_sec_connections got unknown kwargs: {extra_kwargs!r}") @@ -18947,7 +18946,7 @@ def list_ip_sec_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19073,7 +19072,7 @@ def list_ipv6s(self, **kwargs): "vnic_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ipv6s got unknown kwargs: {extra_kwargs!r}") @@ -19085,14 +19084,14 @@ def list_ipv6s(self, **kwargs): "subnetId": kwargs.get("subnet_id", missing), "vnicId": kwargs.get("vnic_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19191,7 +19190,7 @@ def list_local_peering_gateways(self, compartment_id, **kwargs): "page", "vcn_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_local_peering_gateways got unknown kwargs: {extra_kwargs!r}") @@ -19202,7 +19201,7 @@ def list_local_peering_gateways(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "vcnId": kwargs.get("vcn_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19337,7 +19336,7 @@ def list_nat_gateways(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_nat_gateways got unknown kwargs: {extra_kwargs!r}") @@ -19373,7 +19372,7 @@ def list_nat_gateways(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19490,7 +19489,7 @@ def list_network_security_group_security_rules(self, network_security_group_id, "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_security_group_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -19499,10 +19498,10 @@ def list_network_security_group_security_rules(self, network_security_group_id, "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'direction' in kwargs: @@ -19533,7 +19532,7 @@ def list_network_security_group_security_rules(self, network_security_group_id, "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19645,7 +19644,7 @@ def list_network_security_group_vnics(self, network_security_group_id, **kwargs) "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_security_group_vnics got unknown kwargs: {extra_kwargs!r}") @@ -19654,10 +19653,10 @@ def list_network_security_group_vnics(self, network_security_group_id, **kwargs) "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -19680,7 +19679,7 @@ def list_network_security_group_vnics(self, network_security_group_id, **kwargs) "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19824,7 +19823,7 @@ def list_network_security_groups(self, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_security_groups got unknown kwargs: {extra_kwargs!r}") @@ -19861,7 +19860,7 @@ def list_network_security_groups(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19995,7 +19994,7 @@ def list_private_ips(self, **kwargs): "vnic_id", "vlan_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_ips got unknown kwargs: {extra_kwargs!r}") @@ -20008,7 +20007,7 @@ def list_private_ips(self, **kwargs): "vnicId": kwargs.get("vnic_id", missing), "vlanId": kwargs.get("vlan_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20139,7 +20138,7 @@ def list_public_ip_pools(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_public_ip_pools got unknown kwargs: {extra_kwargs!r}") @@ -20167,14 +20166,14 @@ def list_public_ip_pools(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20315,7 +20314,7 @@ def list_public_ips(self, scope, compartment_id, **kwargs): "lifetime", "public_ip_pool_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_public_ips got unknown kwargs: {extra_kwargs!r}") @@ -20342,7 +20341,7 @@ def list_public_ips(self, scope, compartment_id, **kwargs): "compartmentId": compartment_id, "publicIpPoolId": kwargs.get("public_ip_pool_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20446,7 +20445,7 @@ def list_remote_peering_connections(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_remote_peering_connections got unknown kwargs: {extra_kwargs!r}") @@ -20457,7 +20456,7 @@ def list_remote_peering_connections(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20596,7 +20595,7 @@ def list_route_tables(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_route_tables got unknown kwargs: {extra_kwargs!r}") @@ -20632,7 +20631,7 @@ def list_route_tables(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20767,7 +20766,7 @@ def list_security_lists(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_lists got unknown kwargs: {extra_kwargs!r}") @@ -20803,7 +20802,7 @@ def list_security_lists(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20934,7 +20933,7 @@ def list_service_gateways(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_gateways got unknown kwargs: {extra_kwargs!r}") @@ -20969,7 +20968,7 @@ def list_service_gateways(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21062,7 +21061,7 @@ def list_services(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_services got unknown kwargs: {extra_kwargs!r}") @@ -21071,7 +21070,7 @@ def list_services(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21206,7 +21205,7 @@ def list_subnets(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subnets got unknown kwargs: {extra_kwargs!r}") @@ -21242,7 +21241,7 @@ def list_subnets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21370,7 +21369,7 @@ def list_vcns(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vcns got unknown kwargs: {extra_kwargs!r}") @@ -21405,7 +21404,7 @@ def list_vcns(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21502,7 +21501,7 @@ def list_virtual_circuit_associated_tunnels(self, virtual_circuit_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_circuit_associated_tunnels got unknown kwargs: {extra_kwargs!r}") @@ -21511,17 +21510,17 @@ def list_virtual_circuit_associated_tunnels(self, virtual_circuit_id, **kwargs): "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21624,7 +21623,7 @@ def list_virtual_circuit_bandwidth_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_circuit_bandwidth_shapes got unknown kwargs: {extra_kwargs!r}") @@ -21634,7 +21633,7 @@ def list_virtual_circuit_bandwidth_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21725,7 +21724,7 @@ def list_virtual_circuit_public_prefixes(self, virtual_circuit_id, **kwargs): "retry_strategy", "verification_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_circuit_public_prefixes got unknown kwargs: {extra_kwargs!r}") @@ -21734,10 +21733,10 @@ def list_virtual_circuit_public_prefixes(self, virtual_circuit_id, **kwargs): "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'verification_state' in kwargs: @@ -21750,7 +21749,7 @@ def list_virtual_circuit_public_prefixes(self, virtual_circuit_id, **kwargs): query_params = { "verificationState": kwargs.get("verification_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21882,7 +21881,7 @@ def list_virtual_circuits(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_circuits got unknown kwargs: {extra_kwargs!r}") @@ -21917,7 +21916,7 @@ def list_virtual_circuits(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22058,7 +22057,7 @@ def list_vlans(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vlans got unknown kwargs: {extra_kwargs!r}") @@ -22094,14 +22093,14 @@ def list_vlans(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22258,7 +22257,7 @@ def list_vtaps(self, compartment_id, **kwargs): "display_name", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vtaps got unknown kwargs: {extra_kwargs!r}") @@ -22298,14 +22297,14 @@ def list_vtaps(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22409,7 +22408,7 @@ def modify_vcn_cidr(self, vcn_id, modify_vcn_cidr_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"modify_vcn_cidr got unknown kwargs: {extra_kwargs!r}") @@ -22418,10 +22417,10 @@ def modify_vcn_cidr(self, vcn_id, modify_vcn_cidr_details, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22431,7 +22430,7 @@ def modify_vcn_cidr(self, vcn_id, modify_vcn_cidr_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22505,7 +22504,7 @@ def remove_drg_route_distribution_statements(self, drg_route_distribution_id, re api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteDistributionStatement/RemoveDrgRouteDistributionStatements" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_drg_route_distribution_statements got unknown kwargs: {extra_kwargs!r}") @@ -22514,10 +22513,10 @@ def remove_drg_route_distribution_statements(self, drg_route_distribution_id, re "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22596,7 +22595,7 @@ def remove_drg_route_rules(self, drg_route_table_id, remove_drg_route_rules_deta api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteRule/RemoveDrgRouteRules" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_drg_route_rules got unknown kwargs: {extra_kwargs!r}") @@ -22605,10 +22604,10 @@ def remove_drg_route_rules(self, drg_route_table_id, remove_drg_route_rules_deta "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22699,7 +22698,7 @@ def remove_export_drg_route_distribution(self, drg_attachment_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_export_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -22708,10 +22707,10 @@ def remove_export_drg_route_distribution(self, drg_attachment_id, **kwargs): "drgAttachmentId": drg_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22720,7 +22719,7 @@ def remove_export_drg_route_distribution(self, drg_attachment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22806,7 +22805,7 @@ def remove_import_drg_route_distribution(self, drg_route_table_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_import_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -22815,10 +22814,10 @@ def remove_import_drg_route_distribution(self, drg_route_table_id, **kwargs): "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22827,7 +22826,7 @@ def remove_import_drg_route_distribution(self, drg_route_table_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22923,7 +22922,7 @@ def remove_ipv6_subnet_cidr(self, subnet_id, remove_subnet_ipv6_cidr_details, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_ipv6_subnet_cidr got unknown kwargs: {extra_kwargs!r}") @@ -22932,10 +22931,10 @@ def remove_ipv6_subnet_cidr(self, subnet_id, remove_subnet_ipv6_cidr_details, ** "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22945,7 +22944,7 @@ def remove_ipv6_subnet_cidr(self, subnet_id, remove_subnet_ipv6_cidr_details, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23043,7 +23042,7 @@ def remove_ipv6_vcn_cidr(self, vcn_id, **kwargs): "if_match", "remove_vcn_ipv6_cidr_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_ipv6_vcn_cidr got unknown kwargs: {extra_kwargs!r}") @@ -23052,10 +23051,10 @@ def remove_ipv6_vcn_cidr(self, vcn_id, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23065,7 +23064,7 @@ def remove_ipv6_vcn_cidr(self, vcn_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23140,7 +23139,7 @@ def remove_network_security_group_security_rules(self, network_security_group_id api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/SecurityRule/RemoveNetworkSecurityGroupSecurityRules" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_network_security_group_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -23149,10 +23148,10 @@ def remove_network_security_group_security_rules(self, network_security_group_id "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23248,7 +23247,7 @@ def remove_public_ip_pool_capacity(self, public_ip_pool_id, remove_public_ip_poo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_public_ip_pool_capacity got unknown kwargs: {extra_kwargs!r}") @@ -23257,10 +23256,10 @@ def remove_public_ip_pool_capacity(self, public_ip_pool_id, remove_public_ip_poo "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23269,7 +23268,7 @@ def remove_public_ip_pool_capacity(self, public_ip_pool_id, remove_public_ip_poo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23372,7 +23371,7 @@ def remove_vcn_cidr(self, vcn_id, remove_vcn_cidr_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_vcn_cidr got unknown kwargs: {extra_kwargs!r}") @@ -23381,10 +23380,10 @@ def remove_vcn_cidr(self, vcn_id, remove_vcn_cidr_details, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23394,7 +23393,7 @@ def remove_vcn_cidr(self, vcn_id, remove_vcn_cidr_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23483,7 +23482,7 @@ def update_byoip_range(self, byoip_range_id, update_byoip_range_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -23492,10 +23491,10 @@ def update_byoip_range(self, byoip_range_id, update_byoip_range_details, **kwarg "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23504,7 +23503,7 @@ def update_byoip_range(self, byoip_range_id, update_byoip_range_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23594,7 +23593,7 @@ def update_capture_filter(self, capture_filter_id, update_capture_filter_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_capture_filter got unknown kwargs: {extra_kwargs!r}") @@ -23603,10 +23602,10 @@ def update_capture_filter(self, capture_filter_id, update_capture_filter_details "captureFilterId": capture_filter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23615,7 +23614,7 @@ def update_capture_filter(self, capture_filter_id, update_capture_filter_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23701,7 +23700,7 @@ def update_cpe(self, cpe_id, update_cpe_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cpe got unknown kwargs: {extra_kwargs!r}") @@ -23710,10 +23709,10 @@ def update_cpe(self, cpe_id, update_cpe_details, **kwargs): "cpeId": cpe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23721,7 +23720,7 @@ def update_cpe(self, cpe_id, update_cpe_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23808,7 +23807,7 @@ def update_cross_connect(self, cross_connect_id, update_cross_connect_details, * "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cross_connect got unknown kwargs: {extra_kwargs!r}") @@ -23817,10 +23816,10 @@ def update_cross_connect(self, cross_connect_id, update_cross_connect_details, * "crossConnectId": cross_connect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23828,7 +23827,7 @@ def update_cross_connect(self, cross_connect_id, update_cross_connect_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23916,7 +23915,7 @@ def update_cross_connect_group(self, cross_connect_group_id, update_cross_connec "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cross_connect_group got unknown kwargs: {extra_kwargs!r}") @@ -23925,10 +23924,10 @@ def update_cross_connect_group(self, cross_connect_group_id, update_cross_connec "crossConnectGroupId": cross_connect_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23936,7 +23935,7 @@ def update_cross_connect_group(self, cross_connect_group_id, update_cross_connec "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24026,7 +24025,7 @@ def update_dhcp_options(self, dhcp_id, update_dhcp_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dhcp_options got unknown kwargs: {extra_kwargs!r}") @@ -24035,10 +24034,10 @@ def update_dhcp_options(self, dhcp_id, update_dhcp_details, **kwargs): "dhcpId": dhcp_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24046,7 +24045,7 @@ def update_dhcp_options(self, dhcp_id, update_dhcp_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24131,7 +24130,7 @@ def update_drg(self, drg_id, update_drg_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg got unknown kwargs: {extra_kwargs!r}") @@ -24140,10 +24139,10 @@ def update_drg(self, drg_id, update_drg_details, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24151,7 +24150,7 @@ def update_drg(self, drg_id, update_drg_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24237,7 +24236,7 @@ def update_drg_attachment(self, drg_attachment_id, update_drg_attachment_details "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg_attachment got unknown kwargs: {extra_kwargs!r}") @@ -24246,10 +24245,10 @@ def update_drg_attachment(self, drg_attachment_id, update_drg_attachment_details "drgAttachmentId": drg_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24257,7 +24256,7 @@ def update_drg_attachment(self, drg_attachment_id, update_drg_attachment_details "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24342,7 +24341,7 @@ def update_drg_route_distribution(self, drg_route_distribution_id, update_drg_ro "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg_route_distribution got unknown kwargs: {extra_kwargs!r}") @@ -24351,10 +24350,10 @@ def update_drg_route_distribution(self, drg_route_distribution_id, update_drg_ro "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24362,7 +24361,7 @@ def update_drg_route_distribution(self, drg_route_distribution_id, update_drg_ro "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24437,7 +24436,7 @@ def update_drg_route_distribution_statements(self, drg_route_distribution_id, up api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteDistributionStatement/UpdateDrgRouteDistributionStatements" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg_route_distribution_statements got unknown kwargs: {extra_kwargs!r}") @@ -24446,10 +24445,10 @@ def update_drg_route_distribution_statements(self, drg_route_distribution_id, up "drgRouteDistributionId": drg_route_distribution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24530,7 +24529,7 @@ def update_drg_route_rules(self, drg_route_table_id, update_drg_route_rules_deta api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/DrgRouteRule/UpdateDrgRouteRules" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg_route_rules got unknown kwargs: {extra_kwargs!r}") @@ -24539,10 +24538,10 @@ def update_drg_route_rules(self, drg_route_table_id, update_drg_route_rules_deta "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24633,7 +24632,7 @@ def update_drg_route_table(self, drg_route_table_id, update_drg_route_table_deta "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drg_route_table got unknown kwargs: {extra_kwargs!r}") @@ -24642,10 +24641,10 @@ def update_drg_route_table(self, drg_route_table_id, update_drg_route_table_deta "drgRouteTableId": drg_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24653,7 +24652,7 @@ def update_drg_route_table(self, drg_route_table_id, update_drg_route_table_deta "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24742,7 +24741,7 @@ def update_internet_gateway(self, ig_id, update_internet_gateway_details, **kwar "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_internet_gateway got unknown kwargs: {extra_kwargs!r}") @@ -24751,10 +24750,10 @@ def update_internet_gateway(self, ig_id, update_internet_gateway_details, **kwar "igId": ig_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24762,7 +24761,7 @@ def update_internet_gateway(self, ig_id, update_internet_gateway_details, **kwar "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24850,7 +24849,7 @@ def update_ip_sec_connection(self, ipsc_id, update_ip_sec_connection_details, ** "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ip_sec_connection got unknown kwargs: {extra_kwargs!r}") @@ -24859,10 +24858,10 @@ def update_ip_sec_connection(self, ipsc_id, update_ip_sec_connection_details, ** "ipscId": ipsc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24870,7 +24869,7 @@ def update_ip_sec_connection(self, ipsc_id, update_ip_sec_connection_details, ** "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24978,7 +24977,7 @@ def update_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, update_ip_sec_conn "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ip_sec_connection_tunnel got unknown kwargs: {extra_kwargs!r}") @@ -24988,10 +24987,10 @@ def update_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, update_ip_sec_conn "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25000,7 +24999,7 @@ def update_ip_sec_connection_tunnel(self, ipsc_id, tunnel_id, update_ip_sec_conn "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25094,7 +25093,7 @@ def update_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, upda "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ip_sec_connection_tunnel_shared_secret got unknown kwargs: {extra_kwargs!r}") @@ -25104,10 +25103,10 @@ def update_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, upda "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25115,7 +25114,7 @@ def update_ip_sec_connection_tunnel_shared_secret(self, ipsc_id, tunnel_id, upda "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25215,7 +25214,7 @@ def update_ipv6(self, ipv6_id, update_ipv6_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ipv6 got unknown kwargs: {extra_kwargs!r}") @@ -25224,10 +25223,10 @@ def update_ipv6(self, ipv6_id, update_ipv6_details, **kwargs): "ipv6Id": ipv6_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25236,7 +25235,7 @@ def update_ipv6(self, ipv6_id, update_ipv6_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25321,7 +25320,7 @@ def update_local_peering_gateway(self, local_peering_gateway_id, update_local_pe "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_local_peering_gateway got unknown kwargs: {extra_kwargs!r}") @@ -25330,10 +25329,10 @@ def update_local_peering_gateway(self, local_peering_gateway_id, update_local_pe "localPeeringGatewayId": local_peering_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25341,7 +25340,7 @@ def update_local_peering_gateway(self, local_peering_gateway_id, update_local_pe "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25426,7 +25425,7 @@ def update_nat_gateway(self, nat_gateway_id, update_nat_gateway_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_nat_gateway got unknown kwargs: {extra_kwargs!r}") @@ -25435,10 +25434,10 @@ def update_nat_gateway(self, nat_gateway_id, update_nat_gateway_details, **kwarg "natGatewayId": nat_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25446,7 +25445,7 @@ def update_nat_gateway(self, nat_gateway_id, update_nat_gateway_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25547,7 +25546,7 @@ def update_network_security_group(self, network_security_group_id, update_networ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_security_group got unknown kwargs: {extra_kwargs!r}") @@ -25556,10 +25555,10 @@ def update_network_security_group(self, network_security_group_id, update_networ "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25567,7 +25566,7 @@ def update_network_security_group(self, network_security_group_id, update_networ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25643,7 +25642,7 @@ def update_network_security_group_security_rules(self, network_security_group_id api_reference_link = "https://docs.oracle.com/iaas/api/#/en/iaas/20160918/SecurityRule/UpdateNetworkSecurityGroupSecurityRules" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_security_group_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -25652,10 +25651,10 @@ def update_network_security_group_security_rules(self, network_security_group_id "networkSecurityGroupId": network_security_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25757,7 +25756,7 @@ def update_private_ip(self, private_ip_id, update_private_ip_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_ip got unknown kwargs: {extra_kwargs!r}") @@ -25766,10 +25765,10 @@ def update_private_ip(self, private_ip_id, update_private_ip_details, **kwargs): "privateIpId": private_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25777,7 +25776,7 @@ def update_private_ip(self, private_ip_id, update_private_ip_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25903,7 +25902,7 @@ def update_public_ip(self, public_ip_id, update_public_ip_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_public_ip got unknown kwargs: {extra_kwargs!r}") @@ -25912,10 +25911,10 @@ def update_public_ip(self, public_ip_id, update_public_ip_details, **kwargs): "publicIpId": public_ip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25923,7 +25922,7 @@ def update_public_ip(self, public_ip_id, update_public_ip_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26013,7 +26012,7 @@ def update_public_ip_pool(self, public_ip_pool_id, update_public_ip_pool_details "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_public_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -26022,10 +26021,10 @@ def update_public_ip_pool(self, public_ip_pool_id, update_public_ip_pool_details "publicIpPoolId": public_ip_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26034,7 +26033,7 @@ def update_public_ip_pool(self, public_ip_pool_id, update_public_ip_pool_details "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26119,7 +26118,7 @@ def update_remote_peering_connection(self, remote_peering_connection_id, update_ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_remote_peering_connection got unknown kwargs: {extra_kwargs!r}") @@ -26128,10 +26127,10 @@ def update_remote_peering_connection(self, remote_peering_connection_id, update_ "remotePeeringConnectionId": remote_peering_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26139,7 +26138,7 @@ def update_remote_peering_connection(self, remote_peering_connection_id, update_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26229,7 +26228,7 @@ def update_route_table(self, rt_id, update_route_table_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_route_table got unknown kwargs: {extra_kwargs!r}") @@ -26238,10 +26237,10 @@ def update_route_table(self, rt_id, update_route_table_details, **kwargs): "rtId": rt_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26249,7 +26248,7 @@ def update_route_table(self, rt_id, update_route_table_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26338,7 +26337,7 @@ def update_security_list(self, security_list_id, update_security_list_details, * "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_list got unknown kwargs: {extra_kwargs!r}") @@ -26347,10 +26346,10 @@ def update_security_list(self, security_list_id, update_security_list_details, * "securityListId": security_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26358,7 +26357,7 @@ def update_security_list(self, security_list_id, update_security_list_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26444,7 +26443,7 @@ def update_service_gateway(self, service_gateway_id, update_service_gateway_deta "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_service_gateway got unknown kwargs: {extra_kwargs!r}") @@ -26453,10 +26452,10 @@ def update_service_gateway(self, service_gateway_id, update_service_gateway_deta "serviceGatewayId": service_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26464,7 +26463,7 @@ def update_service_gateway(self, service_gateway_id, update_service_gateway_deta "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26549,7 +26548,7 @@ def update_subnet(self, subnet_id, update_subnet_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_subnet got unknown kwargs: {extra_kwargs!r}") @@ -26558,10 +26557,10 @@ def update_subnet(self, subnet_id, update_subnet_details, **kwargs): "subnetId": subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26569,7 +26568,7 @@ def update_subnet(self, subnet_id, update_subnet_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26674,7 +26673,7 @@ def update_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, update_tunnel_cpe_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tunnel_cpe_device_config got unknown kwargs: {extra_kwargs!r}") @@ -26684,10 +26683,10 @@ def update_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, update_tunnel_cpe_ "tunnelId": tunnel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26697,7 +26696,7 @@ def update_tunnel_cpe_device_config(self, ipsc_id, tunnel_id, update_tunnel_cpe_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26785,7 +26784,7 @@ def update_vcn(self, vcn_id, update_vcn_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vcn got unknown kwargs: {extra_kwargs!r}") @@ -26794,10 +26793,10 @@ def update_vcn(self, vcn_id, update_vcn_details, **kwargs): "vcnId": vcn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26805,7 +26804,7 @@ def update_vcn(self, vcn_id, update_vcn_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26915,7 +26914,7 @@ def update_virtual_circuit(self, virtual_circuit_id, update_virtual_circuit_deta "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_virtual_circuit got unknown kwargs: {extra_kwargs!r}") @@ -26924,10 +26923,10 @@ def update_virtual_circuit(self, virtual_circuit_id, update_virtual_circuit_deta "virtualCircuitId": virtual_circuit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26935,7 +26934,7 @@ def update_virtual_circuit(self, virtual_circuit_id, update_virtual_circuit_deta "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27028,7 +27027,7 @@ def update_vlan(self, vlan_id, update_vlan_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vlan got unknown kwargs: {extra_kwargs!r}") @@ -27037,10 +27036,10 @@ def update_vlan(self, vlan_id, update_vlan_details, **kwargs): "vlanId": vlan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27049,7 +27048,7 @@ def update_vlan(self, vlan_id, update_vlan_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27134,7 +27133,7 @@ def update_vnic(self, vnic_id, update_vnic_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vnic got unknown kwargs: {extra_kwargs!r}") @@ -27143,10 +27142,10 @@ def update_vnic(self, vnic_id, update_vnic_details, **kwargs): "vnicId": vnic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27154,7 +27153,7 @@ def update_vnic(self, vnic_id, update_vnic_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27244,7 +27243,7 @@ def update_vtap(self, vtap_id, update_vtap_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vtap got unknown kwargs: {extra_kwargs!r}") @@ -27253,10 +27252,10 @@ def update_vtap(self, vtap_id, update_vtap_details, **kwargs): "vtapId": vtap_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27265,7 +27264,7 @@ def update_vtap(self, vtap_id, update_vtap_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27355,7 +27354,7 @@ def upgrade_drg(self, drg_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_drg got unknown kwargs: {extra_kwargs!r}") @@ -27364,10 +27363,10 @@ def upgrade_drg(self, drg_id, **kwargs): "drgId": drg_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27376,7 +27375,7 @@ def upgrade_drg(self, drg_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27457,7 +27456,7 @@ def validate_byoip_range(self, byoip_range_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -27466,10 +27465,10 @@ def validate_byoip_range(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27477,7 +27476,7 @@ def validate_byoip_range(self, byoip_range_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27554,7 +27553,7 @@ def withdraw_byoip_range(self, byoip_range_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"withdraw_byoip_range got unknown kwargs: {extra_kwargs!r}") @@ -27563,10 +27562,10 @@ def withdraw_byoip_range(self, byoip_range_id, **kwargs): "byoipRangeId": byoip_range_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27574,7 +27573,7 @@ def withdraw_byoip_range(self, byoip_range_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dashboard_service/dashboard_client.py b/src/oci/dashboard_service/dashboard_client.py index eeeaa310d8..7a0b82d2fa 100644 --- a/src/oci/dashboard_service/dashboard_client.py +++ b/src/oci/dashboard_service/dashboard_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def change_dashboard_group(self, dashboard_id, change_dashboard_group_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dashboard_group got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def change_dashboard_group(self, dashboard_id, change_dashboard_group_details, * "dashboardId": dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_dashboard_group(self, dashboard_id, change_dashboard_group_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def create_dashboard(self, create_dashboard_details, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -308,7 +307,7 @@ def create_dashboard(self, create_dashboard_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -403,7 +402,7 @@ def delete_dashboard(self, dashboard_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,10 @@ def delete_dashboard(self, dashboard_id, **kwargs): "dashboardId": dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -425,7 +424,7 @@ def delete_dashboard(self, dashboard_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -509,7 +508,7 @@ def get_dashboard(self, dashboard_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -518,10 +517,10 @@ def get_dashboard(self, dashboard_id, **kwargs): "dashboardId": dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def get_dashboard(self, dashboard_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -657,7 +656,7 @@ def list_dashboards(self, dashboard_group_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dashboards got unknown kwargs: {extra_kwargs!r}") @@ -693,7 +692,7 @@ def list_dashboards(self, dashboard_group_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -701,7 +700,7 @@ def list_dashboards(self, dashboard_group_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -800,7 +799,7 @@ def update_dashboard(self, dashboard_id, update_dashboard_details, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -809,10 +808,10 @@ def update_dashboard(self, dashboard_id, update_dashboard_details, **kwargs): "dashboardId": dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -822,7 +821,7 @@ def update_dashboard(self, dashboard_id, update_dashboard_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dashboard_service/dashboard_group_client.py b/src/oci/dashboard_service/dashboard_group_client.py index 906d1671cc..494967d1a1 100644 --- a/src/oci/dashboard_service/dashboard_group_client.py +++ b/src/oci/dashboard_service/dashboard_group_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def change_dashboard_group_compartment(self, dashboard_group_id, change_dashboar "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dashboard_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def change_dashboard_group_compartment(self, dashboard_group_id, change_dashboar "dashboardGroupId": dashboard_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_dashboard_group_compartment(self, dashboard_group_id, change_dashboar "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def create_dashboard_group(self, create_dashboard_group_details, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dashboard_group got unknown kwargs: {extra_kwargs!r}") @@ -308,7 +307,7 @@ def create_dashboard_group(self, create_dashboard_group_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -403,7 +402,7 @@ def delete_dashboard_group(self, dashboard_group_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dashboard_group got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,10 @@ def delete_dashboard_group(self, dashboard_group_id, **kwargs): "dashboardGroupId": dashboard_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -425,7 +424,7 @@ def delete_dashboard_group(self, dashboard_group_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -509,7 +508,7 @@ def get_dashboard_group(self, dashboard_group_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dashboard_group got unknown kwargs: {extra_kwargs!r}") @@ -518,10 +517,10 @@ def get_dashboard_group(self, dashboard_group_id, **kwargs): "dashboardGroupId": dashboard_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def get_dashboard_group(self, dashboard_group_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -657,7 +656,7 @@ def list_dashboard_groups(self, compartment_id, **kwargs): "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dashboard_groups got unknown kwargs: {extra_kwargs!r}") @@ -693,7 +692,7 @@ def list_dashboard_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -701,7 +700,7 @@ def list_dashboard_groups(self, compartment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -800,7 +799,7 @@ def update_dashboard_group(self, dashboard_group_id, update_dashboard_group_deta "opc_request_id", "opc_cross_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dashboard_group got unknown kwargs: {extra_kwargs!r}") @@ -809,10 +808,10 @@ def update_dashboard_group(self, dashboard_group_id, update_dashboard_group_deta "dashboardGroupId": dashboard_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -822,7 +821,7 @@ def update_dashboard_group(self, dashboard_group_id, update_dashboard_group_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-cross-region": kwargs.get("opc_cross_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_catalog/data_catalog_client.py b/src/oci/data_catalog/data_catalog_client.py index 28e338809a..48ad6396ea 100644 --- a/src/oci/data_catalog/data_catalog_client.py +++ b/src/oci/data_catalog/data_catalog_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def add_catalog_lock(self, catalog_id, add_resource_lock_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_catalog_lock got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def add_catalog_lock(self, catalog_id, add_resource_lock_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def add_catalog_lock(self, catalog_id, add_resource_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def add_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, add_res "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_catalog_private_endpoint_lock got unknown kwargs: {extra_kwargs!r}") @@ -287,10 +286,10 @@ def add_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, add_res "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -299,7 +298,7 @@ def add_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, add_res "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -399,7 +398,7 @@ def add_data_selector_patterns(self, catalog_id, data_asset_key, data_selector_p "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_data_selector_patterns got unknown kwargs: {extra_kwargs!r}") @@ -409,10 +408,10 @@ def add_data_selector_patterns(self, catalog_id, data_asset_key, data_selector_p "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -422,7 +421,7 @@ def add_data_selector_patterns(self, catalog_id, data_asset_key, data_selector_p "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -511,7 +510,7 @@ def add_metastore_lock(self, metastore_id, add_resource_lock_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_metastore_lock got unknown kwargs: {extra_kwargs!r}") @@ -520,10 +519,10 @@ def add_metastore_lock(self, metastore_id, add_resource_lock_details, **kwargs): "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -532,7 +531,7 @@ def add_metastore_lock(self, metastore_id, add_resource_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -632,7 +631,7 @@ def associate_custom_property(self, catalog_id, type_key, associate_custom_prope "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"associate_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -642,10 +641,10 @@ def associate_custom_property(self, catalog_id, type_key, associate_custom_prope "typeKey": type_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -655,7 +654,7 @@ def associate_custom_property(self, catalog_id, type_key, associate_custom_prope "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -753,7 +752,7 @@ def asynchronous_export_data_asset(self, catalog_id, data_asset_key, asynchronou "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"asynchronous_export_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -763,10 +762,10 @@ def asynchronous_export_data_asset(self, catalog_id, data_asset_key, asynchronou "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') export_type_allowed_values = ["CUSTOM_PROPERTY_VALUES", "ALL"] @@ -779,7 +778,7 @@ def asynchronous_export_data_asset(self, catalog_id, data_asset_key, asynchronou query_params = { "exportType": self.base_client.generate_collection_format_param(export_type, 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -787,7 +786,7 @@ def asynchronous_export_data_asset(self, catalog_id, data_asset_key, asynchronou "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -882,7 +881,7 @@ def asynchronous_export_glossary(self, catalog_id, glossary_key, asynchronous_ex "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"asynchronous_export_glossary got unknown kwargs: {extra_kwargs!r}") @@ -892,10 +891,10 @@ def asynchronous_export_glossary(self, catalog_id, glossary_key, asynchronous_ex "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -904,7 +903,7 @@ def asynchronous_export_glossary(self, catalog_id, glossary_key, asynchronous_ex "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1006,7 +1005,7 @@ def attach_catalog_private_endpoint(self, attach_catalog_private_endpoint_detail "opc_retry_token", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1015,16 +1014,16 @@ def attach_catalog_private_endpoint(self, attach_catalog_private_endpoint_detail "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1033,7 +1032,7 @@ def attach_catalog_private_endpoint(self, attach_catalog_private_endpoint_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1127,7 +1126,7 @@ def change_catalog_compartment(self, change_catalog_compartment_details, catalog "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_catalog_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1136,16 +1135,16 @@ def change_catalog_compartment(self, change_catalog_compartment_details, catalog "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1153,7 +1152,7 @@ def change_catalog_compartment(self, change_catalog_compartment_details, catalog "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1246,7 +1245,7 @@ def change_catalog_private_endpoint_compartment(self, change_catalog_private_end "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_catalog_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1255,16 +1254,16 @@ def change_catalog_private_endpoint_compartment(self, change_catalog_private_end "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1272,7 +1271,7 @@ def change_catalog_private_endpoint_compartment(self, change_catalog_private_end "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1365,7 +1364,7 @@ def change_metastore_compartment(self, change_metastore_compartment_details, met "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_metastore_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1374,16 +1373,16 @@ def change_metastore_compartment(self, change_metastore_compartment_details, met "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1391,7 +1390,7 @@ def change_metastore_compartment(self, change_metastore_compartment_details, met "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1486,7 +1485,7 @@ def create_attribute(self, catalog_id, data_asset_key, entity_key, create_attrib "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_attribute got unknown kwargs: {extra_kwargs!r}") @@ -1497,10 +1496,10 @@ def create_attribute(self, catalog_id, data_asset_key, entity_key, create_attrib "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1509,7 +1508,7 @@ def create_attribute(self, catalog_id, data_asset_key, entity_key, create_attrib "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1608,7 +1607,7 @@ def create_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_attribute_tag got unknown kwargs: {extra_kwargs!r}") @@ -1620,10 +1619,10 @@ def create_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "attributeKey": attribute_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1632,7 +1631,7 @@ def create_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1720,7 +1719,7 @@ def create_catalog(self, create_catalog_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_catalog got unknown kwargs: {extra_kwargs!r}") @@ -1731,7 +1730,7 @@ def create_catalog(self, create_catalog_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1814,7 +1813,7 @@ def create_catalog_private_endpoint(self, create_catalog_private_endpoint_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1825,7 +1824,7 @@ def create_catalog_private_endpoint(self, create_catalog_private_endpoint_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1914,7 +1913,7 @@ def create_connection(self, catalog_id, data_asset_key, create_connection_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection got unknown kwargs: {extra_kwargs!r}") @@ -1924,10 +1923,10 @@ def create_connection(self, catalog_id, data_asset_key, create_connection_detail "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1936,7 +1935,7 @@ def create_connection(self, catalog_id, data_asset_key, create_connection_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2029,7 +2028,7 @@ def create_custom_property(self, catalog_id, namespace_id, create_custom_propert "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -2039,10 +2038,10 @@ def create_custom_property(self, catalog_id, namespace_id, create_custom_propert "namespaceId": namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2051,7 +2050,7 @@ def create_custom_property(self, catalog_id, namespace_id, create_custom_propert "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2141,7 +2140,7 @@ def create_data_asset(self, catalog_id, create_data_asset_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -2150,10 +2149,10 @@ def create_data_asset(self, catalog_id, create_data_asset_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2162,7 +2161,7 @@ def create_data_asset(self, catalog_id, create_data_asset_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2255,7 +2254,7 @@ def create_data_asset_tag(self, catalog_id, data_asset_key, create_data_asset_ta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_asset_tag got unknown kwargs: {extra_kwargs!r}") @@ -2265,10 +2264,10 @@ def create_data_asset_tag(self, catalog_id, data_asset_key, create_data_asset_ta "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2277,7 +2276,7 @@ def create_data_asset_tag(self, catalog_id, data_asset_key, create_data_asset_ta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2370,7 +2369,7 @@ def create_entity(self, catalog_id, data_asset_key, create_entity_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_entity got unknown kwargs: {extra_kwargs!r}") @@ -2380,10 +2379,10 @@ def create_entity(self, catalog_id, data_asset_key, create_entity_details, **kwa "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2392,7 +2391,7 @@ def create_entity(self, catalog_id, data_asset_key, create_entity_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2488,7 +2487,7 @@ def create_entity_tag(self, catalog_id, data_asset_key, entity_key, create_entit "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_entity_tag got unknown kwargs: {extra_kwargs!r}") @@ -2499,10 +2498,10 @@ def create_entity_tag(self, catalog_id, data_asset_key, entity_key, create_entit "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2511,7 +2510,7 @@ def create_entity_tag(self, catalog_id, data_asset_key, entity_key, create_entit "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2604,7 +2603,7 @@ def create_folder(self, catalog_id, data_asset_key, create_folder_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_folder got unknown kwargs: {extra_kwargs!r}") @@ -2614,10 +2613,10 @@ def create_folder(self, catalog_id, data_asset_key, create_folder_details, **kwa "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2626,7 +2625,7 @@ def create_folder(self, catalog_id, data_asset_key, create_folder_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2722,7 +2721,7 @@ def create_folder_tag(self, catalog_id, data_asset_key, folder_key, create_folde "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_folder_tag got unknown kwargs: {extra_kwargs!r}") @@ -2733,10 +2732,10 @@ def create_folder_tag(self, catalog_id, data_asset_key, folder_key, create_folde "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2745,7 +2744,7 @@ def create_folder_tag(self, catalog_id, data_asset_key, folder_key, create_folde "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2835,7 +2834,7 @@ def create_glossary(self, catalog_id, create_glossary_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_glossary got unknown kwargs: {extra_kwargs!r}") @@ -2844,10 +2843,10 @@ def create_glossary(self, catalog_id, create_glossary_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2856,7 +2855,7 @@ def create_glossary(self, catalog_id, create_glossary_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2946,7 +2945,7 @@ def create_job(self, catalog_id, create_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job got unknown kwargs: {extra_kwargs!r}") @@ -2955,10 +2954,10 @@ def create_job(self, catalog_id, create_job_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2967,7 +2966,7 @@ def create_job(self, catalog_id, create_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3057,7 +3056,7 @@ def create_job_definition(self, catalog_id, create_job_definition_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job_definition got unknown kwargs: {extra_kwargs!r}") @@ -3066,10 +3065,10 @@ def create_job_definition(self, catalog_id, create_job_definition_details, **kwa "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3078,7 +3077,7 @@ def create_job_definition(self, catalog_id, create_job_definition_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3171,7 +3170,7 @@ def create_job_execution(self, catalog_id, job_key, create_job_execution_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job_execution got unknown kwargs: {extra_kwargs!r}") @@ -3181,10 +3180,10 @@ def create_job_execution(self, catalog_id, job_key, create_job_execution_details "jobKey": job_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3193,7 +3192,7 @@ def create_job_execution(self, catalog_id, job_key, create_job_execution_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3280,7 +3279,7 @@ def create_metastore(self, create_metastore_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_metastore got unknown kwargs: {extra_kwargs!r}") @@ -3291,7 +3290,7 @@ def create_metastore(self, create_metastore_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3377,7 +3376,7 @@ def create_namespace(self, catalog_id, create_namespace_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_namespace got unknown kwargs: {extra_kwargs!r}") @@ -3386,10 +3385,10 @@ def create_namespace(self, catalog_id, create_namespace_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3398,7 +3397,7 @@ def create_namespace(self, catalog_id, create_namespace_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3488,7 +3487,7 @@ def create_pattern(self, catalog_id, create_pattern_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pattern got unknown kwargs: {extra_kwargs!r}") @@ -3497,10 +3496,10 @@ def create_pattern(self, catalog_id, create_pattern_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3509,7 +3508,7 @@ def create_pattern(self, catalog_id, create_pattern_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3602,7 +3601,7 @@ def create_term(self, catalog_id, glossary_key, create_term_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_term got unknown kwargs: {extra_kwargs!r}") @@ -3612,10 +3611,10 @@ def create_term(self, catalog_id, glossary_key, create_term_details, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3624,7 +3623,7 @@ def create_term(self, catalog_id, glossary_key, create_term_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3720,7 +3719,7 @@ def create_term_relationship(self, catalog_id, glossary_key, term_key, create_te "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_term_relationship got unknown kwargs: {extra_kwargs!r}") @@ -3731,10 +3730,10 @@ def create_term_relationship(self, catalog_id, glossary_key, term_key, create_te "termKey": term_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3743,7 +3742,7 @@ def create_term_relationship(self, catalog_id, glossary_key, term_key, create_te "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3839,7 +3838,7 @@ def delete_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_attribute got unknown kwargs: {extra_kwargs!r}") @@ -3851,10 +3850,10 @@ def delete_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "attributeKey": attribute_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3863,7 +3862,7 @@ def delete_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3957,7 +3956,7 @@ def delete_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_attribute_tag got unknown kwargs: {extra_kwargs!r}") @@ -3970,10 +3969,10 @@ def delete_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3982,7 +3981,7 @@ def delete_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4068,7 +4067,7 @@ def delete_catalog(self, catalog_id, **kwargs): "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_catalog got unknown kwargs: {extra_kwargs!r}") @@ -4077,16 +4076,16 @@ def delete_catalog(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4094,7 +4093,7 @@ def delete_catalog(self, catalog_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4182,7 +4181,7 @@ def delete_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs) "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4191,16 +4190,16 @@ def delete_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs) "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4208,7 +4207,7 @@ def delete_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4298,7 +4297,7 @@ def delete_connection(self, catalog_id, data_asset_key, connection_key, **kwargs "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection got unknown kwargs: {extra_kwargs!r}") @@ -4309,10 +4308,10 @@ def delete_connection(self, catalog_id, data_asset_key, connection_key, **kwargs "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4321,7 +4320,7 @@ def delete_connection(self, catalog_id, data_asset_key, connection_key, **kwargs "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4409,7 +4408,7 @@ def delete_custom_property(self, catalog_id, namespace_id, custom_property_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -4420,10 +4419,10 @@ def delete_custom_property(self, catalog_id, namespace_id, custom_property_key, "customPropertyKey": custom_property_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4432,7 +4431,7 @@ def delete_custom_property(self, catalog_id, namespace_id, custom_property_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4517,7 +4516,7 @@ def delete_data_asset(self, catalog_id, data_asset_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -4527,10 +4526,10 @@ def delete_data_asset(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4539,7 +4538,7 @@ def delete_data_asset(self, catalog_id, data_asset_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4627,7 +4626,7 @@ def delete_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_asset_tag got unknown kwargs: {extra_kwargs!r}") @@ -4638,10 +4637,10 @@ def delete_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4650,7 +4649,7 @@ def delete_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4738,7 +4737,7 @@ def delete_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_entity got unknown kwargs: {extra_kwargs!r}") @@ -4749,10 +4748,10 @@ def delete_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4761,7 +4760,7 @@ def delete_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4852,7 +4851,7 @@ def delete_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_entity_tag got unknown kwargs: {extra_kwargs!r}") @@ -4864,10 +4863,10 @@ def delete_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **k "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4876,7 +4875,7 @@ def delete_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4964,7 +4963,7 @@ def delete_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_folder got unknown kwargs: {extra_kwargs!r}") @@ -4975,10 +4974,10 @@ def delete_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4987,7 +4986,7 @@ def delete_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5078,7 +5077,7 @@ def delete_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_folder_tag got unknown kwargs: {extra_kwargs!r}") @@ -5090,10 +5089,10 @@ def delete_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **k "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5102,7 +5101,7 @@ def delete_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5187,7 +5186,7 @@ def delete_glossary(self, catalog_id, glossary_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_glossary got unknown kwargs: {extra_kwargs!r}") @@ -5197,10 +5196,10 @@ def delete_glossary(self, catalog_id, glossary_key, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5209,7 +5208,7 @@ def delete_glossary(self, catalog_id, glossary_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5294,7 +5293,7 @@ def delete_job(self, catalog_id, job_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job got unknown kwargs: {extra_kwargs!r}") @@ -5304,10 +5303,10 @@ def delete_job(self, catalog_id, job_key, **kwargs): "jobKey": job_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5316,7 +5315,7 @@ def delete_job(self, catalog_id, job_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5401,7 +5400,7 @@ def delete_job_definition(self, catalog_id, job_definition_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job_definition got unknown kwargs: {extra_kwargs!r}") @@ -5411,10 +5410,10 @@ def delete_job_definition(self, catalog_id, job_definition_key, **kwargs): "jobDefinitionKey": job_definition_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5423,7 +5422,7 @@ def delete_job_definition(self, catalog_id, job_definition_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5509,7 +5508,7 @@ def delete_metastore(self, metastore_id, **kwargs): "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_metastore got unknown kwargs: {extra_kwargs!r}") @@ -5518,16 +5517,16 @@ def delete_metastore(self, metastore_id, **kwargs): "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5535,7 +5534,7 @@ def delete_metastore(self, metastore_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5622,7 +5621,7 @@ def delete_namespace(self, catalog_id, namespace_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_namespace got unknown kwargs: {extra_kwargs!r}") @@ -5632,10 +5631,10 @@ def delete_namespace(self, catalog_id, namespace_id, **kwargs): "namespaceId": namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5644,7 +5643,7 @@ def delete_namespace(self, catalog_id, namespace_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5729,7 +5728,7 @@ def delete_pattern(self, catalog_id, pattern_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pattern got unknown kwargs: {extra_kwargs!r}") @@ -5739,10 +5738,10 @@ def delete_pattern(self, catalog_id, pattern_key, **kwargs): "patternKey": pattern_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5751,7 +5750,7 @@ def delete_pattern(self, catalog_id, pattern_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5839,7 +5838,7 @@ def delete_term(self, catalog_id, glossary_key, term_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_term got unknown kwargs: {extra_kwargs!r}") @@ -5850,10 +5849,10 @@ def delete_term(self, catalog_id, glossary_key, term_key, **kwargs): "termKey": term_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5862,7 +5861,7 @@ def delete_term(self, catalog_id, glossary_key, term_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5953,7 +5952,7 @@ def delete_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_term_relationship got unknown kwargs: {extra_kwargs!r}") @@ -5965,10 +5964,10 @@ def delete_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "termRelationshipKey": term_relationship_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5977,7 +5976,7 @@ def delete_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6066,7 +6065,7 @@ def detach_catalog_private_endpoint(self, detach_catalog_private_endpoint_detail "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6075,16 +6074,16 @@ def detach_catalog_private_endpoint(self, detach_catalog_private_endpoint_detail "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6092,7 +6091,7 @@ def detach_catalog_private_endpoint(self, detach_catalog_private_endpoint_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6192,7 +6191,7 @@ def disassociate_custom_property(self, catalog_id, type_key, disassociate_custom "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disassociate_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -6202,10 +6201,10 @@ def disassociate_custom_property(self, catalog_id, type_key, disassociate_custom "typeKey": type_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6215,7 +6214,7 @@ def disassociate_custom_property(self, catalog_id, type_key, disassociate_custom "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6305,7 +6304,7 @@ def expand_tree_for_glossary(self, catalog_id, glossary_key, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"expand_tree_for_glossary got unknown kwargs: {extra_kwargs!r}") @@ -6315,10 +6314,10 @@ def expand_tree_for_glossary(self, catalog_id, glossary_key, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6327,7 +6326,7 @@ def expand_tree_for_glossary(self, catalog_id, glossary_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6421,7 +6420,7 @@ def export_glossary(self, catalog_id, glossary_key, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_glossary got unknown kwargs: {extra_kwargs!r}") @@ -6431,16 +6430,16 @@ def export_glossary(self, catalog_id, glossary_key, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isRelationshipExported": kwargs.get("is_relationship_exported", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, text/csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", @@ -6448,7 +6447,7 @@ def export_glossary(self, catalog_id, glossary_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6552,7 +6551,7 @@ def fetch_entity_lineage(self, catalog_id, data_asset_key, entity_key, fetch_ent "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fetch_entity_lineage got unknown kwargs: {extra_kwargs!r}") @@ -6563,17 +6562,17 @@ def fetch_entity_lineage(self, catalog_id, data_asset_key, entity_key, fetch_ent "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6581,7 +6580,7 @@ def fetch_entity_lineage(self, catalog_id, data_asset_key, entity_key, fetch_ent "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6682,7 +6681,7 @@ def get_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key, * "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_attribute got unknown kwargs: {extra_kwargs!r}") @@ -6694,10 +6693,10 @@ def get_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key, * "attributeKey": attribute_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -6712,14 +6711,14 @@ def get_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key, * "isIncludeObjectRelationships": kwargs.get("is_include_object_relationships", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6817,7 +6816,7 @@ def get_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute_ke "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_attribute_tag got unknown kwargs: {extra_kwargs!r}") @@ -6830,10 +6829,10 @@ def get_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute_ke "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -6847,14 +6846,14 @@ def get_attribute_tag(self, catalog_id, data_asset_key, entity_key, attribute_ke query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6934,7 +6933,7 @@ def get_catalog(self, catalog_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_catalog got unknown kwargs: {extra_kwargs!r}") @@ -6943,10 +6942,10 @@ def get_catalog(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6954,7 +6953,7 @@ def get_catalog(self, catalog_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7032,7 +7031,7 @@ def get_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -7041,10 +7040,10 @@ def get_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs): "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7052,7 +7051,7 @@ def get_catalog_private_endpoint(self, catalog_private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7142,7 +7141,7 @@ def get_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection got unknown kwargs: {extra_kwargs!r}") @@ -7153,10 +7152,10 @@ def get_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7170,14 +7169,14 @@ def get_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7269,7 +7268,7 @@ def get_custom_property(self, catalog_id, namespace_id, custom_property_key, **k "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -7280,10 +7279,10 @@ def get_custom_property(self, catalog_id, namespace_id, custom_property_key, **k "customPropertyKey": custom_property_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7297,14 +7296,14 @@ def get_custom_property(self, catalog_id, namespace_id, custom_property_key, **k query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7393,7 +7392,7 @@ def get_data_asset(self, catalog_id, data_asset_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -7403,10 +7402,10 @@ def get_data_asset(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7420,14 +7419,14 @@ def get_data_asset(self, catalog_id, data_asset_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7519,7 +7518,7 @@ def get_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_asset_tag got unknown kwargs: {extra_kwargs!r}") @@ -7530,10 +7529,10 @@ def get_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7547,14 +7546,14 @@ def get_data_asset_tag(self, catalog_id, data_asset_key, tag_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7650,7 +7649,7 @@ def get_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_entity got unknown kwargs: {extra_kwargs!r}") @@ -7661,10 +7660,10 @@ def get_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7679,14 +7678,14 @@ def get_entity(self, catalog_id, data_asset_key, entity_key, **kwargs): "isIncludeObjectRelationships": kwargs.get("is_include_object_relationships", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7781,7 +7780,7 @@ def get_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **kwar "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_entity_tag got unknown kwargs: {extra_kwargs!r}") @@ -7793,10 +7792,10 @@ def get_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **kwar "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7810,14 +7809,14 @@ def get_entity_tag(self, catalog_id, data_asset_key, entity_key, tag_key, **kwar query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7913,7 +7912,7 @@ def get_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_folder got unknown kwargs: {extra_kwargs!r}") @@ -7924,10 +7923,10 @@ def get_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7942,14 +7941,14 @@ def get_folder(self, catalog_id, data_asset_key, folder_key, **kwargs): "isIncludeObjectRelationships": kwargs.get("is_include_object_relationships", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8044,7 +8043,7 @@ def get_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **kwar "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_folder_tag got unknown kwargs: {extra_kwargs!r}") @@ -8056,10 +8055,10 @@ def get_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **kwar "tagKey": tag_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8073,14 +8072,14 @@ def get_folder_tag(self, catalog_id, data_asset_key, folder_key, tag_key, **kwar query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8169,7 +8168,7 @@ def get_glossary(self, catalog_id, glossary_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_glossary got unknown kwargs: {extra_kwargs!r}") @@ -8179,10 +8178,10 @@ def get_glossary(self, catalog_id, glossary_key, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8196,14 +8195,14 @@ def get_glossary(self, catalog_id, glossary_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8292,7 +8291,7 @@ def get_job(self, catalog_id, job_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -8302,10 +8301,10 @@ def get_job(self, catalog_id, job_key, **kwargs): "jobKey": job_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8319,14 +8318,14 @@ def get_job(self, catalog_id, job_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8415,7 +8414,7 @@ def get_job_definition(self, catalog_id, job_definition_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_definition got unknown kwargs: {extra_kwargs!r}") @@ -8425,10 +8424,10 @@ def get_job_definition(self, catalog_id, job_definition_key, **kwargs): "jobDefinitionKey": job_definition_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8442,14 +8441,14 @@ def get_job_definition(self, catalog_id, job_definition_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8541,7 +8540,7 @@ def get_job_execution(self, catalog_id, job_key, job_execution_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_execution got unknown kwargs: {extra_kwargs!r}") @@ -8552,10 +8551,10 @@ def get_job_execution(self, catalog_id, job_key, job_execution_key, **kwargs): "jobExecutionKey": job_execution_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8569,14 +8568,14 @@ def get_job_execution(self, catalog_id, job_key, job_execution_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8671,7 +8670,7 @@ def get_job_log(self, catalog_id, job_key, job_execution_key, job_log_key, **kwa "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_log got unknown kwargs: {extra_kwargs!r}") @@ -8683,10 +8682,10 @@ def get_job_log(self, catalog_id, job_key, job_execution_key, job_log_key, **kwa "jobLogKey": job_log_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8700,14 +8699,14 @@ def get_job_log(self, catalog_id, job_key, job_execution_key, job_log_key, **kwa query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8802,7 +8801,7 @@ def get_job_metrics(self, catalog_id, job_key, job_execution_key, job_metrics_ke "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_metrics got unknown kwargs: {extra_kwargs!r}") @@ -8814,10 +8813,10 @@ def get_job_metrics(self, catalog_id, job_key, job_execution_key, job_metrics_ke "jobMetricsKey": job_metrics_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -8831,14 +8830,14 @@ def get_job_metrics(self, catalog_id, job_key, job_execution_key, job_metrics_ke query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8918,7 +8917,7 @@ def get_metastore(self, metastore_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_metastore got unknown kwargs: {extra_kwargs!r}") @@ -8927,10 +8926,10 @@ def get_metastore(self, metastore_id, **kwargs): "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8938,7 +8937,7 @@ def get_metastore(self, metastore_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9025,7 +9024,7 @@ def get_namespace(self, catalog_id, namespace_id, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_namespace got unknown kwargs: {extra_kwargs!r}") @@ -9035,10 +9034,10 @@ def get_namespace(self, catalog_id, namespace_id, **kwargs): "namespaceId": namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -9052,14 +9051,14 @@ def get_namespace(self, catalog_id, namespace_id, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9148,7 +9147,7 @@ def get_pattern(self, catalog_id, pattern_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pattern got unknown kwargs: {extra_kwargs!r}") @@ -9158,10 +9157,10 @@ def get_pattern(self, catalog_id, pattern_key, **kwargs): "patternKey": pattern_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -9175,14 +9174,14 @@ def get_pattern(self, catalog_id, pattern_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9274,7 +9273,7 @@ def get_term(self, catalog_id, glossary_key, term_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_term got unknown kwargs: {extra_kwargs!r}") @@ -9285,10 +9284,10 @@ def get_term(self, catalog_id, glossary_key, term_key, **kwargs): "termKey": term_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -9302,14 +9301,14 @@ def get_term(self, catalog_id, glossary_key, term_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9404,7 +9403,7 @@ def get_term_relationship(self, catalog_id, glossary_key, term_key, term_relatio "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_term_relationship got unknown kwargs: {extra_kwargs!r}") @@ -9416,10 +9415,10 @@ def get_term_relationship(self, catalog_id, glossary_key, term_key, term_relatio "termRelationshipKey": term_relationship_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -9433,14 +9432,14 @@ def get_term_relationship(self, catalog_id, glossary_key, term_key, term_relatio query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9529,7 +9528,7 @@ def get_type(self, catalog_id, type_key, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_type got unknown kwargs: {extra_kwargs!r}") @@ -9539,10 +9538,10 @@ def get_type(self, catalog_id, type_key, **kwargs): "typeKey": type_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -9556,14 +9555,14 @@ def get_type(self, catalog_id, type_key, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9643,7 +9642,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -9652,10 +9651,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9663,7 +9662,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9763,7 +9762,7 @@ def import_connection(self, catalog_id, data_asset_key, import_connection_detail "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_connection got unknown kwargs: {extra_kwargs!r}") @@ -9773,10 +9772,10 @@ def import_connection(self, catalog_id, data_asset_key, import_connection_detail "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9786,7 +9785,7 @@ def import_connection(self, catalog_id, data_asset_key, import_connection_detail "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9888,7 +9887,7 @@ def import_data_asset(self, catalog_id, data_asset_key, import_data_asset_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -9898,10 +9897,10 @@ def import_data_asset(self, catalog_id, data_asset_key, import_data_asset_detail "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') import_type_allowed_values = ["CUSTOM_PROPERTY_VALUES", "ALL"] @@ -9915,7 +9914,7 @@ def import_data_asset(self, catalog_id, data_asset_key, import_data_asset_detail "importType": self.base_client.generate_collection_format_param(import_type, 'multi'), "isMissingValueIgnored": kwargs.get("is_missing_value_ignored", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9923,7 +9922,7 @@ def import_data_asset(self, catalog_id, data_asset_key, import_data_asset_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10022,7 +10021,7 @@ def import_glossary(self, catalog_id, glossary_key, import_glossary_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_glossary got unknown kwargs: {extra_kwargs!r}") @@ -10032,16 +10031,16 @@ def import_glossary(self, catalog_id, glossary_key, import_glossary_details, **k "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isRelationshipImported": kwargs.get("is_relationship_imported", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10049,7 +10048,7 @@ def import_glossary(self, catalog_id, glossary_key, import_glossary_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10170,7 +10169,7 @@ def list_aggregated_physical_entities(self, catalog_id, data_asset_key, entity_k "is_include_properties", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_aggregated_physical_entities got unknown kwargs: {extra_kwargs!r}") @@ -10181,10 +10180,10 @@ def list_aggregated_physical_entities(self, catalog_id, data_asset_key, entity_k "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -10218,14 +10217,14 @@ def list_aggregated_physical_entities(self, catalog_id, data_asset_key, entity_k "page": kwargs.get("page", missing), "isIncludeProperties": kwargs.get("is_include_properties", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10368,7 +10367,7 @@ def list_attribute_tags(self, catalog_id, data_asset_key, entity_key, attribute_ "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_attribute_tags got unknown kwargs: {extra_kwargs!r}") @@ -10380,10 +10379,10 @@ def list_attribute_tags(self, catalog_id, data_asset_key, entity_key, attribute_ "attributeKey": attribute_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -10428,14 +10427,14 @@ def list_attribute_tags(self, catalog_id, data_asset_key, entity_key, attribute_ "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10630,7 +10629,7 @@ def list_attributes(self, catalog_id, data_asset_key, entity_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_attributes got unknown kwargs: {extra_kwargs!r}") @@ -10641,10 +10640,10 @@ def list_attributes(self, catalog_id, data_asset_key, entity_key, **kwargs): "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -10701,14 +10700,14 @@ def list_attributes(self, catalog_id, data_asset_key, entity_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10818,7 +10817,7 @@ def list_catalog_private_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_catalog_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -10853,14 +10852,14 @@ def list_catalog_private_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10968,7 +10967,7 @@ def list_catalogs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_catalogs got unknown kwargs: {extra_kwargs!r}") @@ -11003,14 +11002,14 @@ def list_catalogs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11167,7 +11166,7 @@ def list_connections(self, catalog_id, data_asset_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connections got unknown kwargs: {extra_kwargs!r}") @@ -11177,10 +11176,10 @@ def list_connections(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11229,14 +11228,14 @@ def list_connections(self, catalog_id, data_asset_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11393,7 +11392,7 @@ def list_custom_properties(self, catalog_id, namespace_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_custom_properties got unknown kwargs: {extra_kwargs!r}") @@ -11403,10 +11402,10 @@ def list_custom_properties(self, catalog_id, namespace_id, **kwargs): "namespaceId": namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'data_types' in kwargs: @@ -11470,14 +11469,14 @@ def list_custom_properties(self, catalog_id, namespace_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11614,7 +11613,7 @@ def list_data_asset_tags(self, catalog_id, data_asset_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_asset_tags got unknown kwargs: {extra_kwargs!r}") @@ -11624,10 +11623,10 @@ def list_data_asset_tags(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11672,14 +11671,14 @@ def list_data_asset_tags(self, catalog_id, data_asset_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11829,7 +11828,7 @@ def list_data_assets(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_assets got unknown kwargs: {extra_kwargs!r}") @@ -11838,10 +11837,10 @@ def list_data_assets(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11889,14 +11888,14 @@ def list_data_assets(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12021,7 +12020,7 @@ def list_derived_logical_entities(self, catalog_id, pattern_key, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_derived_logical_entities got unknown kwargs: {extra_kwargs!r}") @@ -12031,10 +12030,10 @@ def list_derived_logical_entities(self, catalog_id, pattern_key, **kwargs): "patternKey": pattern_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -12058,7 +12057,7 @@ def list_derived_logical_entities(self, catalog_id, pattern_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12067,7 +12066,7 @@ def list_derived_logical_entities(self, catalog_id, pattern_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12272,7 +12271,7 @@ def list_entities(self, catalog_id, data_asset_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_entities got unknown kwargs: {extra_kwargs!r}") @@ -12282,10 +12281,10 @@ def list_entities(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12351,14 +12350,14 @@ def list_entities(self, catalog_id, data_asset_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12498,7 +12497,7 @@ def list_entity_tags(self, catalog_id, data_asset_key, entity_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_entity_tags got unknown kwargs: {extra_kwargs!r}") @@ -12509,10 +12508,10 @@ def list_entity_tags(self, catalog_id, data_asset_key, entity_key, **kwargs): "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12557,14 +12556,14 @@ def list_entity_tags(self, catalog_id, data_asset_key, entity_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12704,7 +12703,7 @@ def list_folder_tags(self, catalog_id, data_asset_key, folder_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_folder_tags got unknown kwargs: {extra_kwargs!r}") @@ -12715,10 +12714,10 @@ def list_folder_tags(self, catalog_id, data_asset_key, folder_key, **kwargs): "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12763,14 +12762,14 @@ def list_folder_tags(self, catalog_id, data_asset_key, folder_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12952,7 +12951,7 @@ def list_folders(self, catalog_id, data_asset_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_folders got unknown kwargs: {extra_kwargs!r}") @@ -12962,10 +12961,10 @@ def list_folders(self, catalog_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13026,14 +13025,14 @@ def list_folders(self, catalog_id, data_asset_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13175,7 +13174,7 @@ def list_glossaries(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_glossaries got unknown kwargs: {extra_kwargs!r}") @@ -13184,10 +13183,10 @@ def list_glossaries(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13233,14 +13232,14 @@ def list_glossaries(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13414,7 +13413,7 @@ def list_job_definitions(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_definitions got unknown kwargs: {extra_kwargs!r}") @@ -13423,10 +13422,10 @@ def list_job_definitions(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'job_execution_state' in kwargs: @@ -13493,14 +13492,14 @@ def list_job_definitions(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13687,7 +13686,7 @@ def list_job_executions(self, catalog_id, job_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_executions got unknown kwargs: {extra_kwargs!r}") @@ -13697,10 +13696,10 @@ def list_job_executions(self, catalog_id, job_key, **kwargs): "jobKey": job_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13762,14 +13761,14 @@ def list_job_executions(self, catalog_id, job_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13911,7 +13910,7 @@ def list_job_logs(self, catalog_id, job_key, job_execution_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_logs got unknown kwargs: {extra_kwargs!r}") @@ -13922,10 +13921,10 @@ def list_job_logs(self, catalog_id, job_key, job_execution_key, **kwargs): "jobExecutionKey": job_execution_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13970,14 +13969,14 @@ def list_job_logs(self, catalog_id, job_key, job_execution_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14146,7 +14145,7 @@ def list_job_metrics(self, catalog_id, job_key, job_execution_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_metrics got unknown kwargs: {extra_kwargs!r}") @@ -14157,10 +14156,10 @@ def list_job_metrics(self, catalog_id, job_key, job_execution_key, **kwargs): "jobExecutionKey": job_execution_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -14204,14 +14203,14 @@ def list_job_metrics(self, catalog_id, job_key, job_execution_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14410,7 +14409,7 @@ def list_jobs(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -14419,10 +14418,10 @@ def list_jobs(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -14493,14 +14492,14 @@ def list_jobs(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14610,7 +14609,7 @@ def list_metastores(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_metastores got unknown kwargs: {extra_kwargs!r}") @@ -14645,14 +14644,14 @@ def list_metastores(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14792,7 +14791,7 @@ def list_namespaces(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -14801,10 +14800,10 @@ def list_namespaces(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -14850,14 +14849,14 @@ def list_namespaces(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14999,7 +14998,7 @@ def list_patterns(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_patterns got unknown kwargs: {extra_kwargs!r}") @@ -15008,10 +15007,10 @@ def list_patterns(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -15057,14 +15056,14 @@ def list_patterns(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15228,7 +15227,7 @@ def list_rules(self, catalog_id, data_asset_key, entity_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rules got unknown kwargs: {extra_kwargs!r}") @@ -15239,10 +15238,10 @@ def list_rules(self, catalog_id, data_asset_key, entity_key, **kwargs): "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'rule_type' in kwargs: @@ -15305,14 +15304,14 @@ def list_rules(self, catalog_id, data_asset_key, entity_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15434,7 +15433,7 @@ def list_tags(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tags got unknown kwargs: {extra_kwargs!r}") @@ -15443,10 +15442,10 @@ def list_tags(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -15488,14 +15487,14 @@ def list_tags(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15623,7 +15622,7 @@ def list_term_relationships(self, catalog_id, glossary_key, term_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_term_relationships got unknown kwargs: {extra_kwargs!r}") @@ -15634,10 +15633,10 @@ def list_term_relationships(self, catalog_id, glossary_key, term_key, **kwargs): "termKey": term_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -15679,14 +15678,14 @@ def list_term_relationships(self, catalog_id, glossary_key, term_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15829,7 +15828,7 @@ def list_terms(self, catalog_id, glossary_key, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_terms got unknown kwargs: {extra_kwargs!r}") @@ -15839,10 +15838,10 @@ def list_terms(self, catalog_id, glossary_key, **kwargs): "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -15895,14 +15894,14 @@ def list_terms(self, catalog_id, glossary_key, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16038,7 +16037,7 @@ def list_types(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_types got unknown kwargs: {extra_kwargs!r}") @@ -16047,10 +16046,10 @@ def list_types(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -16096,14 +16095,14 @@ def list_types(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16203,7 +16202,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -16212,10 +16211,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16238,14 +16237,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16345,7 +16344,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -16354,10 +16353,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16380,14 +16379,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16475,7 +16474,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -16485,14 +16484,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16590,7 +16589,7 @@ def object_stats(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"object_stats got unknown kwargs: {extra_kwargs!r}") @@ -16599,10 +16598,10 @@ def object_stats(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16625,14 +16624,14 @@ def object_stats(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16730,7 +16729,7 @@ def parse_connection(self, catalog_id, data_asset_key, parse_connection_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"parse_connection got unknown kwargs: {extra_kwargs!r}") @@ -16740,16 +16739,16 @@ def parse_connection(self, catalog_id, data_asset_key, parse_connection_details, "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "connectionKey": kwargs.get("connection_key", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16757,7 +16756,7 @@ def parse_connection(self, catalog_id, data_asset_key, parse_connection_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16850,7 +16849,7 @@ def process_recommendation(self, catalog_id, process_recommendation_details, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"process_recommendation got unknown kwargs: {extra_kwargs!r}") @@ -16859,10 +16858,10 @@ def process_recommendation(self, catalog_id, process_recommendation_details, **k "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16871,7 +16870,7 @@ def process_recommendation(self, catalog_id, process_recommendation_details, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16970,7 +16969,7 @@ def recommendations(self, catalog_id, recommendation_type, source_object_key, so "recommendation_status", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"recommendations got unknown kwargs: {extra_kwargs!r}") @@ -16979,10 +16978,10 @@ def recommendations(self, catalog_id, recommendation_type, source_object_key, so "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') recommendation_type_allowed_values = ["LINK_GLOSSARY_TERM"] @@ -17011,14 +17010,14 @@ def recommendations(self, catalog_id, recommendation_type, source_object_key, so "sourceObjectType": source_object_type, "recommendationStatus": kwargs.get("recommendation_status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17106,7 +17105,7 @@ def remove_catalog_lock(self, catalog_id, remove_resource_lock_details, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_catalog_lock got unknown kwargs: {extra_kwargs!r}") @@ -17115,10 +17114,10 @@ def remove_catalog_lock(self, catalog_id, remove_resource_lock_details, **kwargs "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17127,7 +17126,7 @@ def remove_catalog_lock(self, catalog_id, remove_resource_lock_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17215,7 +17214,7 @@ def remove_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, remo "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_catalog_private_endpoint_lock got unknown kwargs: {extra_kwargs!r}") @@ -17224,10 +17223,10 @@ def remove_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, remo "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17236,7 +17235,7 @@ def remove_catalog_private_endpoint_lock(self, catalog_private_endpoint_id, remo "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17336,7 +17335,7 @@ def remove_data_selector_patterns(self, catalog_id, data_asset_key, data_selecto "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_data_selector_patterns got unknown kwargs: {extra_kwargs!r}") @@ -17346,10 +17345,10 @@ def remove_data_selector_patterns(self, catalog_id, data_asset_key, data_selecto "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17359,7 +17358,7 @@ def remove_data_selector_patterns(self, catalog_id, data_asset_key, data_selecto "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17448,7 +17447,7 @@ def remove_metastore_lock(self, metastore_id, remove_resource_lock_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_metastore_lock got unknown kwargs: {extra_kwargs!r}") @@ -17457,10 +17456,10 @@ def remove_metastore_lock(self, metastore_id, remove_resource_lock_details, **kw "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17469,7 +17468,7 @@ def remove_metastore_lock(self, metastore_id, remove_resource_lock_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17591,7 +17590,7 @@ def search_criteria(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_criteria got unknown kwargs: {extra_kwargs!r}") @@ -17600,10 +17599,10 @@ def search_criteria(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -17637,14 +17636,14 @@ def search_criteria(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17739,7 +17738,7 @@ def suggest_matches(self, catalog_id, input_text, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"suggest_matches got unknown kwargs: {extra_kwargs!r}") @@ -17748,10 +17747,10 @@ def suggest_matches(self, catalog_id, input_text, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -17759,14 +17758,14 @@ def suggest_matches(self, catalog_id, input_text, **kwargs): "inputText": input_text, "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17865,7 +17864,7 @@ def synchronous_export_data_asset(self, catalog_id, data_asset_key, synchronous_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"synchronous_export_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -17875,10 +17874,10 @@ def synchronous_export_data_asset(self, catalog_id, data_asset_key, synchronous_ "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') export_type_allowed_values = ["CUSTOM_PROPERTY_VALUES", "ALL"] @@ -17891,7 +17890,7 @@ def synchronous_export_data_asset(self, catalog_id, data_asset_key, synchronous_ query_params = { "exportType": self.base_client.generate_collection_format_param(export_type, 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", @@ -17899,7 +17898,7 @@ def synchronous_export_data_asset(self, catalog_id, data_asset_key, synchronous_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17994,7 +17993,7 @@ def test_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_connection got unknown kwargs: {extra_kwargs!r}") @@ -18005,10 +18004,10 @@ def test_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18017,7 +18016,7 @@ def test_connection(self, catalog_id, data_asset_key, connection_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18116,7 +18115,7 @@ def update_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_attribute got unknown kwargs: {extra_kwargs!r}") @@ -18128,10 +18127,10 @@ def update_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "attributeKey": attribute_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18140,7 +18139,7 @@ def update_attribute(self, catalog_id, data_asset_key, entity_key, attribute_key "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18233,7 +18232,7 @@ def update_catalog(self, catalog_id, update_catalog_details, **kwargs): "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_catalog got unknown kwargs: {extra_kwargs!r}") @@ -18242,16 +18241,16 @@ def update_catalog(self, catalog_id, update_catalog_details, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18259,7 +18258,7 @@ def update_catalog(self, catalog_id, update_catalog_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18354,7 +18353,7 @@ def update_catalog_private_endpoint(self, catalog_private_endpoint_id, update_ca "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_catalog_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -18363,16 +18362,16 @@ def update_catalog_private_endpoint(self, catalog_private_endpoint_id, update_ca "catalogPrivateEndpointId": catalog_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -18380,7 +18379,7 @@ def update_catalog_private_endpoint(self, catalog_private_endpoint_id, update_ca "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18475,7 +18474,7 @@ def update_connection(self, catalog_id, data_asset_key, connection_key, update_c "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connection got unknown kwargs: {extra_kwargs!r}") @@ -18486,10 +18485,10 @@ def update_connection(self, catalog_id, data_asset_key, connection_key, update_c "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18498,7 +18497,7 @@ def update_connection(self, catalog_id, data_asset_key, connection_key, update_c "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18593,7 +18592,7 @@ def update_custom_property(self, catalog_id, namespace_id, custom_property_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_custom_property got unknown kwargs: {extra_kwargs!r}") @@ -18604,10 +18603,10 @@ def update_custom_property(self, catalog_id, namespace_id, custom_property_key, "customPropertyKey": custom_property_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18616,7 +18615,7 @@ def update_custom_property(self, catalog_id, namespace_id, custom_property_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18708,7 +18707,7 @@ def update_data_asset(self, catalog_id, data_asset_key, update_data_asset_detail "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -18718,10 +18717,10 @@ def update_data_asset(self, catalog_id, data_asset_key, update_data_asset_detail "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18730,7 +18729,7 @@ def update_data_asset(self, catalog_id, data_asset_key, update_data_asset_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18825,7 +18824,7 @@ def update_entity(self, catalog_id, data_asset_key, entity_key, update_entity_de "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_entity got unknown kwargs: {extra_kwargs!r}") @@ -18836,10 +18835,10 @@ def update_entity(self, catalog_id, data_asset_key, entity_key, update_entity_de "entityKey": entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18848,7 +18847,7 @@ def update_entity(self, catalog_id, data_asset_key, entity_key, update_entity_de "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18943,7 +18942,7 @@ def update_folder(self, catalog_id, data_asset_key, folder_key, update_folder_de "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_folder got unknown kwargs: {extra_kwargs!r}") @@ -18954,10 +18953,10 @@ def update_folder(self, catalog_id, data_asset_key, folder_key, update_folder_de "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18966,7 +18965,7 @@ def update_folder(self, catalog_id, data_asset_key, folder_key, update_folder_de "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19058,7 +19057,7 @@ def update_glossary(self, catalog_id, glossary_key, update_glossary_details, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_glossary got unknown kwargs: {extra_kwargs!r}") @@ -19068,10 +19067,10 @@ def update_glossary(self, catalog_id, glossary_key, update_glossary_details, **k "glossaryKey": glossary_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19080,7 +19079,7 @@ def update_glossary(self, catalog_id, glossary_key, update_glossary_details, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19172,7 +19171,7 @@ def update_job(self, catalog_id, job_key, update_job_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -19182,10 +19181,10 @@ def update_job(self, catalog_id, job_key, update_job_details, **kwargs): "jobKey": job_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19194,7 +19193,7 @@ def update_job(self, catalog_id, job_key, update_job_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19286,7 +19285,7 @@ def update_job_definition(self, catalog_id, job_definition_key, update_job_defin "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job_definition got unknown kwargs: {extra_kwargs!r}") @@ -19296,10 +19295,10 @@ def update_job_definition(self, catalog_id, job_definition_key, update_job_defin "jobDefinitionKey": job_definition_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19308,7 +19307,7 @@ def update_job_definition(self, catalog_id, job_definition_key, update_job_defin "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19401,7 +19400,7 @@ def update_metastore(self, metastore_id, update_metastore_details, **kwargs): "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_metastore got unknown kwargs: {extra_kwargs!r}") @@ -19410,16 +19409,16 @@ def update_metastore(self, metastore_id, update_metastore_details, **kwargs): "metastoreId": metastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19427,7 +19426,7 @@ def update_metastore(self, metastore_id, update_metastore_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19521,7 +19520,7 @@ def update_namespace(self, catalog_id, namespace_id, update_namespace_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_namespace got unknown kwargs: {extra_kwargs!r}") @@ -19531,10 +19530,10 @@ def update_namespace(self, catalog_id, namespace_id, update_namespace_details, * "namespaceId": namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19543,7 +19542,7 @@ def update_namespace(self, catalog_id, namespace_id, update_namespace_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19635,7 +19634,7 @@ def update_pattern(self, catalog_id, pattern_key, update_pattern_details, **kwar "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pattern got unknown kwargs: {extra_kwargs!r}") @@ -19645,10 +19644,10 @@ def update_pattern(self, catalog_id, pattern_key, update_pattern_details, **kwar "patternKey": pattern_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19657,7 +19656,7 @@ def update_pattern(self, catalog_id, pattern_key, update_pattern_details, **kwar "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19752,7 +19751,7 @@ def update_term(self, catalog_id, glossary_key, term_key, update_term_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_term got unknown kwargs: {extra_kwargs!r}") @@ -19763,10 +19762,10 @@ def update_term(self, catalog_id, glossary_key, term_key, update_term_details, * "termKey": term_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19775,7 +19774,7 @@ def update_term(self, catalog_id, glossary_key, term_key, update_term_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19873,7 +19872,7 @@ def update_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_term_relationship got unknown kwargs: {extra_kwargs!r}") @@ -19885,10 +19884,10 @@ def update_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "termRelationshipKey": term_relationship_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19897,7 +19896,7 @@ def update_term_relationship(self, catalog_id, glossary_key, term_key, term_rela "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20000,7 +19999,7 @@ def upload_credentials(self, catalog_id, data_asset_key, connection_key, upload_ "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_credentials got unknown kwargs: {extra_kwargs!r}") @@ -20011,10 +20010,10 @@ def upload_credentials(self, catalog_id, data_asset_key, connection_key, upload_ "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20024,7 +20023,7 @@ def upload_credentials(self, catalog_id, data_asset_key, connection_key, upload_ "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20123,7 +20122,7 @@ def users(self, catalog_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"users got unknown kwargs: {extra_kwargs!r}") @@ -20132,10 +20131,10 @@ def users(self, catalog_id, **kwargs): "catalogId": catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -20158,14 +20157,14 @@ def users(self, catalog_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20259,7 +20258,7 @@ def validate_connection(self, catalog_id, data_asset_key, validate_connection_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_connection got unknown kwargs: {extra_kwargs!r}") @@ -20269,10 +20268,10 @@ def validate_connection(self, catalog_id, data_asset_key, validate_connection_de "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20281,7 +20280,7 @@ def validate_connection(self, catalog_id, data_asset_key, validate_connection_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20376,7 +20375,7 @@ def validate_pattern(self, catalog_id, pattern_key, validate_pattern_details, ** "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_pattern got unknown kwargs: {extra_kwargs!r}") @@ -20386,10 +20385,10 @@ def validate_pattern(self, catalog_id, pattern_key, validate_pattern_details, ** "patternKey": pattern_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20398,7 +20397,7 @@ def validate_pattern(self, catalog_id, pattern_key, validate_pattern_details, ** "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_flow/data_flow_client.py b/src/oci/data_flow/data_flow_client.py index 730a18780a..61fdf3d645 100644 --- a/src/oci/data_flow/data_flow_client.py +++ b/src/oci/data_flow/data_flow_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -176,7 +175,7 @@ def change_application_compartment(self, application_id, change_application_comp "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_application_compartment got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def change_application_compartment(self, application_id, change_application_comp "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -198,7 +197,7 @@ def change_application_compartment(self, application_id, change_application_comp "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -295,7 +294,7 @@ def change_pool_compartment(self, pool_id, change_pool_compartment_details, **kw "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -304,10 +303,10 @@ def change_pool_compartment(self, pool_id, change_pool_compartment_details, **kw "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -317,7 +316,7 @@ def change_pool_compartment(self, pool_id, change_pool_compartment_details, **kw "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -406,7 +405,7 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -415,10 +414,10 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -427,7 +426,7 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -523,7 +522,7 @@ def change_run_compartment(self, run_id, change_run_compartment_details, **kwarg "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_run_compartment got unknown kwargs: {extra_kwargs!r}") @@ -532,10 +531,10 @@ def change_run_compartment(self, run_id, change_run_compartment_details, **kwarg "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -545,7 +544,7 @@ def change_run_compartment(self, run_id, change_run_compartment_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -639,7 +638,7 @@ def change_sql_endpoint_compartment(self, sql_endpoint_id, change_sql_endpoint_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sql_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -648,10 +647,10 @@ def change_sql_endpoint_compartment(self, sql_endpoint_id, change_sql_endpoint_c "sqlEndpointId": sql_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -661,7 +660,7 @@ def change_sql_endpoint_compartment(self, sql_endpoint_id, change_sql_endpoint_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -746,7 +745,7 @@ def create_application(self, create_application_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application got unknown kwargs: {extra_kwargs!r}") @@ -757,7 +756,7 @@ def create_application(self, create_application_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -842,7 +841,7 @@ def create_pool(self, create_pool_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pool got unknown kwargs: {extra_kwargs!r}") @@ -853,7 +852,7 @@ def create_pool(self, create_pool_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -940,7 +939,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -951,7 +950,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1041,7 +1040,7 @@ def create_run(self, create_run_details, **kwargs): "opc_request_id", "opc_parent_rpt_url" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_run got unknown kwargs: {extra_kwargs!r}") @@ -1053,7 +1052,7 @@ def create_run(self, create_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-parent-rpt-url": kwargs.get("opc_parent_rpt_url", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1138,7 +1137,7 @@ def create_sql_endpoint(self, create_sql_endpoint_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1149,7 +1148,7 @@ def create_sql_endpoint(self, create_sql_endpoint_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1230,7 +1229,7 @@ def create_statement(self, create_statement_details, run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_statement got unknown kwargs: {extra_kwargs!r}") @@ -1239,10 +1238,10 @@ def create_statement(self, create_statement_details, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1250,7 +1249,7 @@ def create_statement(self, create_statement_details, run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1335,7 +1334,7 @@ def delete_application(self, application_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application got unknown kwargs: {extra_kwargs!r}") @@ -1344,10 +1343,10 @@ def delete_application(self, application_id, **kwargs): "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1356,7 +1355,7 @@ def delete_application(self, application_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1437,7 +1436,7 @@ def delete_pool(self, pool_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pool got unknown kwargs: {extra_kwargs!r}") @@ -1446,10 +1445,10 @@ def delete_pool(self, pool_id, **kwargs): "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1458,7 +1457,7 @@ def delete_pool(self, pool_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1539,7 +1538,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1548,10 +1547,10 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1560,7 +1559,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1642,7 +1641,7 @@ def delete_run(self, run_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_run got unknown kwargs: {extra_kwargs!r}") @@ -1651,10 +1650,10 @@ def delete_run(self, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1663,7 +1662,7 @@ def delete_run(self, run_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1744,7 +1743,7 @@ def delete_sql_endpoint(self, sql_endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1753,10 +1752,10 @@ def delete_sql_endpoint(self, sql_endpoint_id, **kwargs): "sqlEndpointId": sql_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1765,7 +1764,7 @@ def delete_sql_endpoint(self, sql_endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1849,7 +1848,7 @@ def delete_statement(self, run_id, statement_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_statement got unknown kwargs: {extra_kwargs!r}") @@ -1859,10 +1858,10 @@ def delete_statement(self, run_id, statement_id, **kwargs): "statementId": statement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1871,7 +1870,7 @@ def delete_statement(self, run_id, statement_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1948,7 +1947,7 @@ def get_application(self, application_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application got unknown kwargs: {extra_kwargs!r}") @@ -1957,10 +1956,10 @@ def get_application(self, application_id, **kwargs): "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1968,7 +1967,7 @@ def get_application(self, application_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2047,7 +2046,7 @@ def get_pool(self, pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pool got unknown kwargs: {extra_kwargs!r}") @@ -2056,10 +2055,10 @@ def get_pool(self, pool_id, **kwargs): "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2067,7 +2066,7 @@ def get_pool(self, pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2146,7 +2145,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2155,10 +2154,10 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2166,7 +2165,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2245,7 +2244,7 @@ def get_run(self, run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_run got unknown kwargs: {extra_kwargs!r}") @@ -2254,10 +2253,10 @@ def get_run(self, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2265,7 +2264,7 @@ def get_run(self, run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2347,7 +2346,7 @@ def get_run_log(self, run_id, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_run_log got unknown kwargs: {extra_kwargs!r}") @@ -2357,10 +2356,10 @@ def get_run_log(self, run_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2368,7 +2367,7 @@ def get_run_log(self, run_id, name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2447,7 +2446,7 @@ def get_sql_endpoint(self, sql_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2456,10 +2455,10 @@ def get_sql_endpoint(self, sql_endpoint_id, **kwargs): "sqlEndpointId": sql_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2467,7 +2466,7 @@ def get_sql_endpoint(self, sql_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2549,7 +2548,7 @@ def get_statement(self, run_id, statement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_statement got unknown kwargs: {extra_kwargs!r}") @@ -2559,10 +2558,10 @@ def get_statement(self, run_id, statement_id, **kwargs): "statementId": statement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2570,7 +2569,7 @@ def get_statement(self, run_id, statement_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2649,7 +2648,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2658,10 +2657,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2669,7 +2668,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2785,7 +2784,7 @@ def list_applications(self, compartment_id, **kwargs): "display_name_starts_with", "spark_version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_applications got unknown kwargs: {extra_kwargs!r}") @@ -2815,14 +2814,14 @@ def list_applications(self, compartment_id, **kwargs): "displayNameStartsWith": kwargs.get("display_name_starts_with", missing), "sparkVersion": kwargs.get("spark_version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2940,7 +2939,7 @@ def list_pools(self, compartment_id, **kwargs): "owner_principal_id", "display_name_starts_with" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pools got unknown kwargs: {extra_kwargs!r}") @@ -2977,14 +2976,14 @@ def list_pools(self, compartment_id, **kwargs): "ownerPrincipalId": kwargs.get("owner_principal_id", missing), "displayNameStartsWith": kwargs.get("display_name_starts_with", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3102,7 +3101,7 @@ def list_private_endpoints(self, compartment_id, **kwargs): "owner_principal_id", "display_name_starts_with" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -3139,14 +3138,14 @@ def list_private_endpoints(self, compartment_id, **kwargs): "ownerPrincipalId": kwargs.get("owner_principal_id", missing), "displayNameStartsWith": kwargs.get("display_name_starts_with", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3234,7 +3233,7 @@ def list_run_logs(self, run_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_run_logs got unknown kwargs: {extra_kwargs!r}") @@ -3243,24 +3242,24 @@ def list_run_logs(self, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3392,7 +3391,7 @@ def list_runs(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_runs got unknown kwargs: {extra_kwargs!r}") @@ -3432,14 +3431,14 @@ def list_runs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3555,7 +3554,7 @@ def list_sql_endpoints(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -3591,14 +3590,14 @@ def list_sql_endpoints(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3704,7 +3703,7 @@ def list_statements(self, run_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_statements got unknown kwargs: {extra_kwargs!r}") @@ -3713,10 +3712,10 @@ def list_statements(self, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -3747,14 +3746,14 @@ def list_statements(self, run_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3844,7 +3843,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3853,24 +3852,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3960,7 +3959,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3969,24 +3968,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4076,7 +4075,7 @@ def list_work_requests(self, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4086,14 +4085,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4185,7 +4184,7 @@ def start_pool(self, pool_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_pool got unknown kwargs: {extra_kwargs!r}") @@ -4194,10 +4193,10 @@ def start_pool(self, pool_id, **kwargs): "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4207,7 +4206,7 @@ def start_pool(self, pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4298,7 +4297,7 @@ def stop_pool(self, pool_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_pool got unknown kwargs: {extra_kwargs!r}") @@ -4307,10 +4306,10 @@ def stop_pool(self, pool_id, **kwargs): "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4320,7 +4319,7 @@ def stop_pool(self, pool_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4407,7 +4406,7 @@ def update_application(self, update_application_details, application_id, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application got unknown kwargs: {extra_kwargs!r}") @@ -4416,10 +4415,10 @@ def update_application(self, update_application_details, application_id, **kwarg "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4428,7 +4427,7 @@ def update_application(self, update_application_details, application_id, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4518,7 +4517,7 @@ def update_pool(self, update_pool_details, pool_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pool got unknown kwargs: {extra_kwargs!r}") @@ -4527,10 +4526,10 @@ def update_pool(self, update_pool_details, pool_id, **kwargs): "poolId": pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4539,7 +4538,7 @@ def update_pool(self, update_pool_details, pool_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4627,7 +4626,7 @@ def update_private_endpoint(self, update_private_endpoint_details, private_endpo "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4636,10 +4635,10 @@ def update_private_endpoint(self, update_private_endpoint_details, private_endpo "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4648,7 +4647,7 @@ def update_private_endpoint(self, update_private_endpoint_details, private_endpo "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4734,7 +4733,7 @@ def update_run(self, update_run_details, run_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_run got unknown kwargs: {extra_kwargs!r}") @@ -4743,10 +4742,10 @@ def update_run(self, update_run_details, run_id, **kwargs): "runId": run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4755,7 +4754,7 @@ def update_run(self, update_run_details, run_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4843,7 +4842,7 @@ def update_sql_endpoint(self, update_sql_endpoint_details, sql_endpoint_id, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4852,10 +4851,10 @@ def update_sql_endpoint(self, update_sql_endpoint_details, sql_endpoint_id, **kw "sqlEndpointId": sql_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4864,7 +4863,7 @@ def update_sql_endpoint(self, update_sql_endpoint_details, sql_endpoint_id, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_integration/data_integration_client.py b/src/oci/data_integration/data_integration_client.py index 55c9dd8876..20294623d4 100644 --- a/src/oci/data_integration/data_integration_client.py +++ b/src/oci/data_integration/data_integration_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def change_compartment(self, workspace_id, change_compartment_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_compartment got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def change_compartment(self, workspace_id, change_compartment_details, **kwargs) "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -195,7 +194,7 @@ def change_compartment(self, workspace_id, change_compartment_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -290,7 +289,7 @@ def change_dis_application_compartment(self, workspace_id, dis_application_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dis_application_compartment got unknown kwargs: {extra_kwargs!r}") @@ -300,10 +299,10 @@ def change_dis_application_compartment(self, workspace_id, dis_application_id, c "disApplicationId": dis_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -313,7 +312,7 @@ def change_dis_application_compartment(self, workspace_id, dis_application_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -399,7 +398,7 @@ def create_application(self, workspace_id, create_application_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application got unknown kwargs: {extra_kwargs!r}") @@ -408,10 +407,10 @@ def create_application(self, workspace_id, create_application_details, **kwargs) "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -420,7 +419,7 @@ def create_application(self, workspace_id, create_application_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -511,7 +510,7 @@ def create_application_detailed_description(self, workspace_id, application_key, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -521,10 +520,10 @@ def create_application_detailed_description(self, workspace_id, application_key, "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -533,7 +532,7 @@ def create_application_detailed_description(self, workspace_id, application_key, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -621,7 +620,7 @@ def create_connection(self, workspace_id, create_connection_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection got unknown kwargs: {extra_kwargs!r}") @@ -630,10 +629,10 @@ def create_connection(self, workspace_id, create_connection_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -642,7 +641,7 @@ def create_connection(self, workspace_id, create_connection_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -730,7 +729,7 @@ def create_connection_validation(self, workspace_id, create_connection_validatio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection_validation got unknown kwargs: {extra_kwargs!r}") @@ -739,10 +738,10 @@ def create_connection_validation(self, workspace_id, create_connection_validatio "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -751,7 +750,7 @@ def create_connection_validation(self, workspace_id, create_connection_validatio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -839,7 +838,7 @@ def create_copy_object_request(self, workspace_id, create_copy_object_request_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_copy_object_request got unknown kwargs: {extra_kwargs!r}") @@ -848,10 +847,10 @@ def create_copy_object_request(self, workspace_id, create_copy_object_request_de "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -860,7 +859,7 @@ def create_copy_object_request(self, workspace_id, create_copy_object_request_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -948,7 +947,7 @@ def create_data_asset(self, workspace_id, create_data_asset_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -957,10 +956,10 @@ def create_data_asset(self, workspace_id, create_data_asset_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -969,7 +968,7 @@ def create_data_asset(self, workspace_id, create_data_asset_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1057,7 +1056,7 @@ def create_data_flow(self, workspace_id, create_data_flow_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_flow got unknown kwargs: {extra_kwargs!r}") @@ -1066,10 +1065,10 @@ def create_data_flow(self, workspace_id, create_data_flow_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1078,7 +1077,7 @@ def create_data_flow(self, workspace_id, create_data_flow_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1166,7 +1165,7 @@ def create_data_flow_validation(self, workspace_id, create_data_flow_validation_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_flow_validation got unknown kwargs: {extra_kwargs!r}") @@ -1175,10 +1174,10 @@ def create_data_flow_validation(self, workspace_id, create_data_flow_validation_ "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1187,7 +1186,7 @@ def create_data_flow_validation(self, workspace_id, create_data_flow_validation_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1275,7 +1274,7 @@ def create_dis_application(self, workspace_id, create_dis_application_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dis_application got unknown kwargs: {extra_kwargs!r}") @@ -1284,10 +1283,10 @@ def create_dis_application(self, workspace_id, create_dis_application_details, * "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1296,7 +1295,7 @@ def create_dis_application(self, workspace_id, create_dis_application_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1387,7 +1386,7 @@ def create_dis_application_detailed_description(self, workspace_id, application_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dis_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -1397,10 +1396,10 @@ def create_dis_application_detailed_description(self, workspace_id, application_ "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1409,7 +1408,7 @@ def create_dis_application_detailed_description(self, workspace_id, application_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1509,7 +1508,7 @@ def create_entity_shape(self, workspace_id, connection_key, schema_resource_name "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_entity_shape got unknown kwargs: {extra_kwargs!r}") @@ -1520,10 +1519,10 @@ def create_entity_shape(self, workspace_id, connection_key, schema_resource_name "schemaResourceName": schema_resource_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1533,7 +1532,7 @@ def create_entity_shape(self, workspace_id, connection_key, schema_resource_name "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1621,7 +1620,7 @@ def create_export_request(self, workspace_id, create_export_request_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_export_request got unknown kwargs: {extra_kwargs!r}") @@ -1630,10 +1629,10 @@ def create_export_request(self, workspace_id, create_export_request_details, **k "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1642,7 +1641,7 @@ def create_export_request(self, workspace_id, create_export_request_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1733,7 +1732,7 @@ def create_external_publication(self, workspace_id, task_key, create_external_pu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_publication got unknown kwargs: {extra_kwargs!r}") @@ -1743,10 +1742,10 @@ def create_external_publication(self, workspace_id, task_key, create_external_pu "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1755,7 +1754,7 @@ def create_external_publication(self, workspace_id, task_key, create_external_pu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1846,7 +1845,7 @@ def create_external_publication_validation(self, workspace_id, task_key, create_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_publication_validation got unknown kwargs: {extra_kwargs!r}") @@ -1856,10 +1855,10 @@ def create_external_publication_validation(self, workspace_id, task_key, create_ "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1868,7 +1867,7 @@ def create_external_publication_validation(self, workspace_id, task_key, create_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1957,7 +1956,7 @@ def create_folder(self, workspace_id, create_folder_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_folder got unknown kwargs: {extra_kwargs!r}") @@ -1966,10 +1965,10 @@ def create_folder(self, workspace_id, create_folder_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1978,7 +1977,7 @@ def create_folder(self, workspace_id, create_folder_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2067,7 +2066,7 @@ def create_function_library(self, workspace_id, create_function_library_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_function_library got unknown kwargs: {extra_kwargs!r}") @@ -2076,10 +2075,10 @@ def create_function_library(self, workspace_id, create_function_library_details, "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2088,7 +2087,7 @@ def create_function_library(self, workspace_id, create_function_library_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2176,7 +2175,7 @@ def create_import_request(self, workspace_id, create_import_request_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_import_request got unknown kwargs: {extra_kwargs!r}") @@ -2185,10 +2184,10 @@ def create_import_request(self, workspace_id, create_import_request_details, **k "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2197,7 +2196,7 @@ def create_import_request(self, workspace_id, create_import_request_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2288,7 +2287,7 @@ def create_patch(self, workspace_id, application_key, create_patch_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_patch got unknown kwargs: {extra_kwargs!r}") @@ -2298,10 +2297,10 @@ def create_patch(self, workspace_id, application_key, create_patch_details, **kw "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2310,7 +2309,7 @@ def create_patch(self, workspace_id, application_key, create_patch_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2398,7 +2397,7 @@ def create_pipeline(self, workspace_id, create_pipeline_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -2407,10 +2406,10 @@ def create_pipeline(self, workspace_id, create_pipeline_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2419,7 +2418,7 @@ def create_pipeline(self, workspace_id, create_pipeline_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2507,7 +2506,7 @@ def create_pipeline_validation(self, workspace_id, create_pipeline_validation_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pipeline_validation got unknown kwargs: {extra_kwargs!r}") @@ -2516,10 +2515,10 @@ def create_pipeline_validation(self, workspace_id, create_pipeline_validation_de "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2528,7 +2527,7 @@ def create_pipeline_validation(self, workspace_id, create_pipeline_validation_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2616,7 +2615,7 @@ def create_project(self, workspace_id, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -2625,10 +2624,10 @@ def create_project(self, workspace_id, create_project_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2637,7 +2636,7 @@ def create_project(self, workspace_id, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2728,7 +2727,7 @@ def create_schedule(self, workspace_id, application_key, create_schedule_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_schedule got unknown kwargs: {extra_kwargs!r}") @@ -2738,10 +2737,10 @@ def create_schedule(self, workspace_id, application_key, create_schedule_details "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2750,7 +2749,7 @@ def create_schedule(self, workspace_id, application_key, create_schedule_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2838,7 +2837,7 @@ def create_task(self, workspace_id, create_task_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_task got unknown kwargs: {extra_kwargs!r}") @@ -2847,10 +2846,10 @@ def create_task(self, workspace_id, create_task_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2859,7 +2858,7 @@ def create_task(self, workspace_id, create_task_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2950,7 +2949,7 @@ def create_task_run(self, workspace_id, application_key, create_task_run_details "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_task_run got unknown kwargs: {extra_kwargs!r}") @@ -2960,10 +2959,10 @@ def create_task_run(self, workspace_id, application_key, create_task_run_details "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2972,7 +2971,7 @@ def create_task_run(self, workspace_id, application_key, create_task_run_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3063,7 +3062,7 @@ def create_task_schedule(self, workspace_id, application_key, create_task_schedu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -3073,10 +3072,10 @@ def create_task_schedule(self, workspace_id, application_key, create_task_schedu "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3085,7 +3084,7 @@ def create_task_schedule(self, workspace_id, application_key, create_task_schedu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3173,7 +3172,7 @@ def create_task_validation(self, workspace_id, create_task_validation_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_task_validation got unknown kwargs: {extra_kwargs!r}") @@ -3182,10 +3181,10 @@ def create_task_validation(self, workspace_id, create_task_validation_details, * "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3194,7 +3193,7 @@ def create_task_validation(self, workspace_id, create_task_validation_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3282,7 +3281,7 @@ def create_user_defined_function(self, workspace_id, create_user_defined_functio "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user_defined_function got unknown kwargs: {extra_kwargs!r}") @@ -3291,10 +3290,10 @@ def create_user_defined_function(self, workspace_id, create_user_defined_functio "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3303,7 +3302,7 @@ def create_user_defined_function(self, workspace_id, create_user_defined_functio "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3391,7 +3390,7 @@ def create_user_defined_function_validation(self, workspace_id, create_user_defi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user_defined_function_validation got unknown kwargs: {extra_kwargs!r}") @@ -3400,10 +3399,10 @@ def create_user_defined_function_validation(self, workspace_id, create_user_defi "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3412,7 +3411,7 @@ def create_user_defined_function_validation(self, workspace_id, create_user_defi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3497,7 +3496,7 @@ def create_workspace(self, create_workspace_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_workspace got unknown kwargs: {extra_kwargs!r}") @@ -3508,7 +3507,7 @@ def create_workspace(self, create_workspace_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3594,7 +3593,7 @@ def delete_application(self, workspace_id, application_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application got unknown kwargs: {extra_kwargs!r}") @@ -3604,10 +3603,10 @@ def delete_application(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3616,7 +3615,7 @@ def delete_application(self, workspace_id, application_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3701,7 +3700,7 @@ def delete_application_detailed_description(self, workspace_id, application_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -3711,10 +3710,10 @@ def delete_application_detailed_description(self, workspace_id, application_key, "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3723,7 +3722,7 @@ def delete_application_detailed_description(self, workspace_id, application_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3808,7 +3807,7 @@ def delete_connection(self, workspace_id, connection_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection got unknown kwargs: {extra_kwargs!r}") @@ -3818,10 +3817,10 @@ def delete_connection(self, workspace_id, connection_key, **kwargs): "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3830,7 +3829,7 @@ def delete_connection(self, workspace_id, connection_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3915,7 +3914,7 @@ def delete_connection_validation(self, workspace_id, connection_validation_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection_validation got unknown kwargs: {extra_kwargs!r}") @@ -3925,10 +3924,10 @@ def delete_connection_validation(self, workspace_id, connection_validation_key, "connectionValidationKey": connection_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3937,7 +3936,7 @@ def delete_connection_validation(self, workspace_id, connection_validation_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4022,7 +4021,7 @@ def delete_copy_object_request(self, workspace_id, copy_object_request_key, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_copy_object_request got unknown kwargs: {extra_kwargs!r}") @@ -4032,10 +4031,10 @@ def delete_copy_object_request(self, workspace_id, copy_object_request_key, **kw "copyObjectRequestKey": copy_object_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4044,7 +4043,7 @@ def delete_copy_object_request(self, workspace_id, copy_object_request_key, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4129,7 +4128,7 @@ def delete_data_asset(self, workspace_id, data_asset_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -4139,10 +4138,10 @@ def delete_data_asset(self, workspace_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4151,7 +4150,7 @@ def delete_data_asset(self, workspace_id, data_asset_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4236,7 +4235,7 @@ def delete_data_flow(self, workspace_id, data_flow_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_flow got unknown kwargs: {extra_kwargs!r}") @@ -4246,10 +4245,10 @@ def delete_data_flow(self, workspace_id, data_flow_key, **kwargs): "dataFlowKey": data_flow_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4258,7 +4257,7 @@ def delete_data_flow(self, workspace_id, data_flow_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4343,7 +4342,7 @@ def delete_data_flow_validation(self, workspace_id, data_flow_validation_key, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_flow_validation got unknown kwargs: {extra_kwargs!r}") @@ -4353,10 +4352,10 @@ def delete_data_flow_validation(self, workspace_id, data_flow_validation_key, ** "dataFlowValidationKey": data_flow_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4365,7 +4364,7 @@ def delete_data_flow_validation(self, workspace_id, data_flow_validation_key, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4450,7 +4449,7 @@ def delete_dis_application(self, workspace_id, dis_application_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dis_application got unknown kwargs: {extra_kwargs!r}") @@ -4460,10 +4459,10 @@ def delete_dis_application(self, workspace_id, dis_application_id, **kwargs): "disApplicationId": dis_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4472,7 +4471,7 @@ def delete_dis_application(self, workspace_id, dis_application_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4557,7 +4556,7 @@ def delete_dis_application_detailed_description(self, workspace_id, application_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dis_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -4567,10 +4566,10 @@ def delete_dis_application_detailed_description(self, workspace_id, application_ "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4579,7 +4578,7 @@ def delete_dis_application_detailed_description(self, workspace_id, application_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4664,7 +4663,7 @@ def delete_export_request(self, workspace_id, export_request_key, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_export_request got unknown kwargs: {extra_kwargs!r}") @@ -4674,10 +4673,10 @@ def delete_export_request(self, workspace_id, export_request_key, **kwargs): "exportRequestKey": export_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4686,7 +4685,7 @@ def delete_export_request(self, workspace_id, export_request_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4774,7 +4773,7 @@ def delete_external_publication(self, workspace_id, task_key, external_publicati "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_publication got unknown kwargs: {extra_kwargs!r}") @@ -4785,10 +4784,10 @@ def delete_external_publication(self, workspace_id, task_key, external_publicati "externalPublicationsKey": external_publications_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4797,7 +4796,7 @@ def delete_external_publication(self, workspace_id, task_key, external_publicati "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4885,7 +4884,7 @@ def delete_external_publication_validation(self, workspace_id, task_key, externa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_publication_validation got unknown kwargs: {extra_kwargs!r}") @@ -4896,10 +4895,10 @@ def delete_external_publication_validation(self, workspace_id, task_key, externa "externalPublicationValidationKey": external_publication_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4908,7 +4907,7 @@ def delete_external_publication_validation(self, workspace_id, task_key, externa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4993,7 +4992,7 @@ def delete_folder(self, workspace_id, folder_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_folder got unknown kwargs: {extra_kwargs!r}") @@ -5003,10 +5002,10 @@ def delete_folder(self, workspace_id, folder_key, **kwargs): "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5015,7 +5014,7 @@ def delete_folder(self, workspace_id, folder_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5100,7 +5099,7 @@ def delete_function_library(self, workspace_id, function_library_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_function_library got unknown kwargs: {extra_kwargs!r}") @@ -5110,10 +5109,10 @@ def delete_function_library(self, workspace_id, function_library_key, **kwargs): "functionLibraryKey": function_library_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5122,7 +5121,7 @@ def delete_function_library(self, workspace_id, function_library_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5207,7 +5206,7 @@ def delete_import_request(self, import_request_key, workspace_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_import_request got unknown kwargs: {extra_kwargs!r}") @@ -5217,10 +5216,10 @@ def delete_import_request(self, import_request_key, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5229,7 +5228,7 @@ def delete_import_request(self, import_request_key, workspace_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5317,7 +5316,7 @@ def delete_patch(self, workspace_id, application_key, patch_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_patch got unknown kwargs: {extra_kwargs!r}") @@ -5328,10 +5327,10 @@ def delete_patch(self, workspace_id, application_key, patch_key, **kwargs): "patchKey": patch_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5340,7 +5339,7 @@ def delete_patch(self, workspace_id, application_key, patch_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5425,7 +5424,7 @@ def delete_pipeline(self, workspace_id, pipeline_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -5435,10 +5434,10 @@ def delete_pipeline(self, workspace_id, pipeline_key, **kwargs): "pipelineKey": pipeline_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5447,7 +5446,7 @@ def delete_pipeline(self, workspace_id, pipeline_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5532,7 +5531,7 @@ def delete_pipeline_validation(self, workspace_id, pipeline_validation_key, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pipeline_validation got unknown kwargs: {extra_kwargs!r}") @@ -5542,10 +5541,10 @@ def delete_pipeline_validation(self, workspace_id, pipeline_validation_key, **kw "pipelineValidationKey": pipeline_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5554,7 +5553,7 @@ def delete_pipeline_validation(self, workspace_id, pipeline_validation_key, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5639,7 +5638,7 @@ def delete_project(self, workspace_id, project_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -5649,10 +5648,10 @@ def delete_project(self, workspace_id, project_key, **kwargs): "projectKey": project_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5661,7 +5660,7 @@ def delete_project(self, workspace_id, project_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5749,7 +5748,7 @@ def delete_schedule(self, workspace_id, application_key, schedule_key, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_schedule got unknown kwargs: {extra_kwargs!r}") @@ -5760,10 +5759,10 @@ def delete_schedule(self, workspace_id, application_key, schedule_key, **kwargs) "scheduleKey": schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5772,7 +5771,7 @@ def delete_schedule(self, workspace_id, application_key, schedule_key, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5857,7 +5856,7 @@ def delete_task(self, workspace_id, task_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_task got unknown kwargs: {extra_kwargs!r}") @@ -5867,10 +5866,10 @@ def delete_task(self, workspace_id, task_key, **kwargs): "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5879,7 +5878,7 @@ def delete_task(self, workspace_id, task_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5967,7 +5966,7 @@ def delete_task_run(self, workspace_id, application_key, task_run_key, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_task_run got unknown kwargs: {extra_kwargs!r}") @@ -5978,10 +5977,10 @@ def delete_task_run(self, workspace_id, application_key, task_run_key, **kwargs) "taskRunKey": task_run_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5990,7 +5989,7 @@ def delete_task_run(self, workspace_id, application_key, task_run_key, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6078,7 +6077,7 @@ def delete_task_schedule(self, workspace_id, application_key, task_schedule_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -6089,10 +6088,10 @@ def delete_task_schedule(self, workspace_id, application_key, task_schedule_key, "taskScheduleKey": task_schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6101,7 +6100,7 @@ def delete_task_schedule(self, workspace_id, application_key, task_schedule_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6186,7 +6185,7 @@ def delete_task_validation(self, workspace_id, task_validation_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_task_validation got unknown kwargs: {extra_kwargs!r}") @@ -6196,10 +6195,10 @@ def delete_task_validation(self, workspace_id, task_validation_key, **kwargs): "taskValidationKey": task_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6208,7 +6207,7 @@ def delete_task_validation(self, workspace_id, task_validation_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6293,7 +6292,7 @@ def delete_user_defined_function(self, workspace_id, user_defined_function_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user_defined_function got unknown kwargs: {extra_kwargs!r}") @@ -6303,10 +6302,10 @@ def delete_user_defined_function(self, workspace_id, user_defined_function_key, "userDefinedFunctionKey": user_defined_function_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6315,7 +6314,7 @@ def delete_user_defined_function(self, workspace_id, user_defined_function_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6400,7 +6399,7 @@ def delete_user_defined_function_validation(self, workspace_id, user_defined_fun "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user_defined_function_validation got unknown kwargs: {extra_kwargs!r}") @@ -6410,10 +6409,10 @@ def delete_user_defined_function_validation(self, workspace_id, user_defined_fun "userDefinedFunctionValidationKey": user_defined_function_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6422,7 +6421,7 @@ def delete_user_defined_function_validation(self, workspace_id, user_defined_fun "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6512,7 +6511,7 @@ def delete_workspace(self, workspace_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_workspace got unknown kwargs: {extra_kwargs!r}") @@ -6521,17 +6520,17 @@ def delete_workspace(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "quiesceTimeout": kwargs.get("quiesce_timeout", missing), "isForceOperation": kwargs.get("is_force_operation", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6539,7 +6538,7 @@ def delete_workspace(self, workspace_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6620,7 +6619,7 @@ def get_application(self, workspace_id, application_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application got unknown kwargs: {extra_kwargs!r}") @@ -6630,10 +6629,10 @@ def get_application(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6641,7 +6640,7 @@ def get_application(self, workspace_id, application_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6722,7 +6721,7 @@ def get_application_detailed_description(self, workspace_id, application_key, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -6732,10 +6731,10 @@ def get_application_detailed_description(self, workspace_id, application_key, ** "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6743,7 +6742,7 @@ def get_application_detailed_description(self, workspace_id, application_key, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6827,7 +6826,7 @@ def get_composite_state(self, workspace_id, application_key, aggregator_key, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_composite_state got unknown kwargs: {extra_kwargs!r}") @@ -6837,23 +6836,23 @@ def get_composite_state(self, workspace_id, application_key, aggregator_key, **k "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "aggregatorKey": aggregator_key } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6936,7 +6935,7 @@ def get_connection(self, workspace_id, connection_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection got unknown kwargs: {extra_kwargs!r}") @@ -6946,10 +6945,10 @@ def get_connection(self, workspace_id, connection_key, **kwargs): "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6957,7 +6956,7 @@ def get_connection(self, workspace_id, connection_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7038,7 +7037,7 @@ def get_connection_validation(self, workspace_id, connection_validation_key, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection_validation got unknown kwargs: {extra_kwargs!r}") @@ -7048,10 +7047,10 @@ def get_connection_validation(self, workspace_id, connection_validation_key, **k "connectionValidationKey": connection_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7059,7 +7058,7 @@ def get_connection_validation(self, workspace_id, connection_validation_key, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7140,7 +7139,7 @@ def get_copy_object_request(self, workspace_id, copy_object_request_key, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_copy_object_request got unknown kwargs: {extra_kwargs!r}") @@ -7150,10 +7149,10 @@ def get_copy_object_request(self, workspace_id, copy_object_request_key, **kwarg "copyObjectRequestKey": copy_object_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7161,7 +7160,7 @@ def get_copy_object_request(self, workspace_id, copy_object_request_key, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7243,7 +7242,7 @@ def get_count_statistic(self, workspace_id, count_statistic_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_count_statistic got unknown kwargs: {extra_kwargs!r}") @@ -7253,10 +7252,10 @@ def get_count_statistic(self, workspace_id, count_statistic_key, **kwargs): "countStatisticKey": count_statistic_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7264,7 +7263,7 @@ def get_count_statistic(self, workspace_id, count_statistic_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7345,7 +7344,7 @@ def get_data_asset(self, workspace_id, data_asset_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -7355,10 +7354,10 @@ def get_data_asset(self, workspace_id, data_asset_key, **kwargs): "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7366,7 +7365,7 @@ def get_data_asset(self, workspace_id, data_asset_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7453,7 +7452,7 @@ def get_data_entity(self, workspace_id, connection_key, schema_resource_name, da "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_entity got unknown kwargs: {extra_kwargs!r}") @@ -7465,10 +7464,10 @@ def get_data_entity(self, workspace_id, connection_key, schema_resource_name, da "dataEntityKey": data_entity_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7476,7 +7475,7 @@ def get_data_entity(self, workspace_id, connection_key, schema_resource_name, da "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7561,7 +7560,7 @@ def get_data_flow(self, workspace_id, data_flow_key, **kwargs): "opc_request_id", "expand_references" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_flow got unknown kwargs: {extra_kwargs!r}") @@ -7571,23 +7570,23 @@ def get_data_flow(self, workspace_id, data_flow_key, **kwargs): "dataFlowKey": data_flow_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "expandReferences": kwargs.get("expand_references", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7670,7 +7669,7 @@ def get_data_flow_validation(self, workspace_id, data_flow_validation_key, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_flow_validation got unknown kwargs: {extra_kwargs!r}") @@ -7680,10 +7679,10 @@ def get_data_flow_validation(self, workspace_id, data_flow_validation_key, **kwa "dataFlowValidationKey": data_flow_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7691,7 +7690,7 @@ def get_data_flow_validation(self, workspace_id, data_flow_validation_key, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7775,7 +7774,7 @@ def get_dependent_object(self, workspace_id, application_key, dependent_object_k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dependent_object got unknown kwargs: {extra_kwargs!r}") @@ -7786,10 +7785,10 @@ def get_dependent_object(self, workspace_id, application_key, dependent_object_k "dependentObjectKey": dependent_object_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7797,7 +7796,7 @@ def get_dependent_object(self, workspace_id, application_key, dependent_object_k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7878,7 +7877,7 @@ def get_dis_application(self, workspace_id, dis_application_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dis_application got unknown kwargs: {extra_kwargs!r}") @@ -7888,10 +7887,10 @@ def get_dis_application(self, workspace_id, dis_application_id, **kwargs): "disApplicationId": dis_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7899,7 +7898,7 @@ def get_dis_application(self, workspace_id, dis_application_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7980,7 +7979,7 @@ def get_dis_application_detailed_description(self, workspace_id, application_key "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dis_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -7990,10 +7989,10 @@ def get_dis_application_detailed_description(self, workspace_id, application_key "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8001,7 +8000,7 @@ def get_dis_application_detailed_description(self, workspace_id, application_key "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8082,7 +8081,7 @@ def get_export_request(self, workspace_id, export_request_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_export_request got unknown kwargs: {extra_kwargs!r}") @@ -8092,10 +8091,10 @@ def get_export_request(self, workspace_id, export_request_key, **kwargs): "exportRequestKey": export_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8103,7 +8102,7 @@ def get_export_request(self, workspace_id, export_request_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8187,7 +8186,7 @@ def get_external_publication(self, workspace_id, task_key, external_publications "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_publication got unknown kwargs: {extra_kwargs!r}") @@ -8198,10 +8197,10 @@ def get_external_publication(self, workspace_id, task_key, external_publications "externalPublicationsKey": external_publications_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8209,7 +8208,7 @@ def get_external_publication(self, workspace_id, task_key, external_publications "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8293,7 +8292,7 @@ def get_external_publication_validation(self, workspace_id, task_key, external_p "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_publication_validation got unknown kwargs: {extra_kwargs!r}") @@ -8304,10 +8303,10 @@ def get_external_publication_validation(self, workspace_id, task_key, external_p "externalPublicationValidationKey": external_publication_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8315,7 +8314,7 @@ def get_external_publication_validation(self, workspace_id, task_key, external_p "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8402,7 +8401,7 @@ def get_folder(self, workspace_id, folder_key, **kwargs): "opc_request_id", "projection" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_folder got unknown kwargs: {extra_kwargs!r}") @@ -8412,10 +8411,10 @@ def get_folder(self, workspace_id, folder_key, **kwargs): "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'projection' in kwargs: @@ -8429,14 +8428,14 @@ def get_folder(self, workspace_id, folder_key, **kwargs): query_params = { "projection": self.base_client.generate_collection_format_param(kwargs.get("projection", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8525,7 +8524,7 @@ def get_function_library(self, workspace_id, function_library_key, **kwargs): "opc_request_id", "projection" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_function_library got unknown kwargs: {extra_kwargs!r}") @@ -8535,10 +8534,10 @@ def get_function_library(self, workspace_id, function_library_key, **kwargs): "functionLibraryKey": function_library_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'projection' in kwargs: @@ -8552,14 +8551,14 @@ def get_function_library(self, workspace_id, function_library_key, **kwargs): query_params = { "projection": self.base_client.generate_collection_format_param(kwargs.get("projection", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8654,7 +8653,7 @@ def get_import_request(self, workspace_id, import_request_key, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_import_request got unknown kwargs: {extra_kwargs!r}") @@ -8664,24 +8663,24 @@ def get_import_request(self, workspace_id, import_request_key, **kwargs): "importRequestKey": import_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8767,7 +8766,7 @@ def get_patch(self, workspace_id, application_key, patch_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_patch got unknown kwargs: {extra_kwargs!r}") @@ -8778,10 +8777,10 @@ def get_patch(self, workspace_id, application_key, patch_key, **kwargs): "patchKey": patch_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8789,7 +8788,7 @@ def get_patch(self, workspace_id, application_key, patch_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8874,7 +8873,7 @@ def get_pipeline(self, workspace_id, pipeline_key, **kwargs): "opc_request_id", "expand_references" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -8884,23 +8883,23 @@ def get_pipeline(self, workspace_id, pipeline_key, **kwargs): "pipelineKey": pipeline_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "expandReferences": kwargs.get("expand_references", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8983,7 +8982,7 @@ def get_pipeline_validation(self, workspace_id, pipeline_validation_key, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pipeline_validation got unknown kwargs: {extra_kwargs!r}") @@ -8993,10 +8992,10 @@ def get_pipeline_validation(self, workspace_id, pipeline_validation_key, **kwarg "pipelineValidationKey": pipeline_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9004,7 +9003,7 @@ def get_pipeline_validation(self, workspace_id, pipeline_validation_key, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9091,7 +9090,7 @@ def get_project(self, workspace_id, project_key, **kwargs): "opc_request_id", "projection" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -9101,10 +9100,10 @@ def get_project(self, workspace_id, project_key, **kwargs): "projectKey": project_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'projection' in kwargs: @@ -9118,14 +9117,14 @@ def get_project(self, workspace_id, project_key, **kwargs): query_params = { "projection": self.base_client.generate_collection_format_param(kwargs.get("projection", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9215,7 +9214,7 @@ def get_published_object(self, workspace_id, application_key, published_object_k "opc_request_id", "expand_references" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_published_object got unknown kwargs: {extra_kwargs!r}") @@ -9226,23 +9225,23 @@ def get_published_object(self, workspace_id, application_key, published_object_k "publishedObjectKey": published_object_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "expandReferences": kwargs.get("expand_references", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9328,7 +9327,7 @@ def get_reference(self, workspace_id, application_key, reference_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_reference got unknown kwargs: {extra_kwargs!r}") @@ -9339,10 +9338,10 @@ def get_reference(self, workspace_id, application_key, reference_key, **kwargs): "referenceKey": reference_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9350,7 +9349,7 @@ def get_reference(self, workspace_id, application_key, reference_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9437,7 +9436,7 @@ def get_runtime_operator(self, workspace_id, application_key, runtime_pipeline_k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_runtime_operator got unknown kwargs: {extra_kwargs!r}") @@ -9449,10 +9448,10 @@ def get_runtime_operator(self, workspace_id, application_key, runtime_pipeline_k "runtimeOperatorKey": runtime_operator_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9460,7 +9459,7 @@ def get_runtime_operator(self, workspace_id, application_key, runtime_pipeline_k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9548,7 +9547,7 @@ def get_runtime_pipeline(self, workspace_id, application_key, runtime_pipeline_k "opc_request_id", "expand_references" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_runtime_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -9559,23 +9558,23 @@ def get_runtime_pipeline(self, workspace_id, application_key, runtime_pipeline_k "runtimePipelineKey": runtime_pipeline_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "expandReferences": kwargs.get("expand_references", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9661,7 +9660,7 @@ def get_schedule(self, workspace_id, application_key, schedule_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_schedule got unknown kwargs: {extra_kwargs!r}") @@ -9672,10 +9671,10 @@ def get_schedule(self, workspace_id, application_key, schedule_key, **kwargs): "scheduleKey": schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9683,7 +9682,7 @@ def get_schedule(self, workspace_id, application_key, schedule_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9767,7 +9766,7 @@ def get_schema(self, workspace_id, connection_key, schema_resource_name, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_schema got unknown kwargs: {extra_kwargs!r}") @@ -9778,10 +9777,10 @@ def get_schema(self, workspace_id, connection_key, schema_resource_name, **kwarg "schemaResourceName": schema_resource_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9789,7 +9788,7 @@ def get_schema(self, workspace_id, connection_key, schema_resource_name, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9874,7 +9873,7 @@ def get_task(self, workspace_id, task_key, **kwargs): "opc_request_id", "expand_references" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_task got unknown kwargs: {extra_kwargs!r}") @@ -9884,23 +9883,23 @@ def get_task(self, workspace_id, task_key, **kwargs): "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "expandReferences": kwargs.get("expand_references", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9986,7 +9985,7 @@ def get_task_run(self, workspace_id, application_key, task_run_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_task_run got unknown kwargs: {extra_kwargs!r}") @@ -9997,10 +9996,10 @@ def get_task_run(self, workspace_id, application_key, task_run_key, **kwargs): "taskRunKey": task_run_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10008,7 +10007,7 @@ def get_task_run(self, workspace_id, application_key, task_run_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10092,7 +10091,7 @@ def get_task_schedule(self, workspace_id, application_key, task_schedule_key, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -10103,10 +10102,10 @@ def get_task_schedule(self, workspace_id, application_key, task_schedule_key, ** "taskScheduleKey": task_schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10114,7 +10113,7 @@ def get_task_schedule(self, workspace_id, application_key, task_schedule_key, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10195,7 +10194,7 @@ def get_task_validation(self, workspace_id, task_validation_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_task_validation got unknown kwargs: {extra_kwargs!r}") @@ -10205,10 +10204,10 @@ def get_task_validation(self, workspace_id, task_validation_key, **kwargs): "taskValidationKey": task_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10216,7 +10215,7 @@ def get_task_validation(self, workspace_id, task_validation_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10297,7 +10296,7 @@ def get_template(self, workspace_id, template_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_template got unknown kwargs: {extra_kwargs!r}") @@ -10307,10 +10306,10 @@ def get_template(self, workspace_id, template_id, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10318,7 +10317,7 @@ def get_template(self, workspace_id, template_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10399,7 +10398,7 @@ def get_user_defined_function(self, workspace_id, user_defined_function_key, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_defined_function got unknown kwargs: {extra_kwargs!r}") @@ -10409,10 +10408,10 @@ def get_user_defined_function(self, workspace_id, user_defined_function_key, **k "userDefinedFunctionKey": user_defined_function_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10420,7 +10419,7 @@ def get_user_defined_function(self, workspace_id, user_defined_function_key, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10501,7 +10500,7 @@ def get_user_defined_function_validation(self, workspace_id, user_defined_functi "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_defined_function_validation got unknown kwargs: {extra_kwargs!r}") @@ -10511,10 +10510,10 @@ def get_user_defined_function_validation(self, workspace_id, user_defined_functi "userDefinedFunctionValidationKey": user_defined_function_validation_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10522,7 +10521,7 @@ def get_user_defined_function_validation(self, workspace_id, user_defined_functi "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10600,7 +10599,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -10609,10 +10608,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10620,7 +10619,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10698,7 +10697,7 @@ def get_workspace(self, workspace_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_workspace got unknown kwargs: {extra_kwargs!r}") @@ -10707,10 +10706,10 @@ def get_workspace(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10718,7 +10717,7 @@ def get_workspace(self, workspace_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10836,7 +10835,7 @@ def list_applications(self, workspace_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_applications got unknown kwargs: {extra_kwargs!r}") @@ -10845,10 +10844,10 @@ def list_applications(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10875,14 +10874,14 @@ def list_applications(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11002,7 +11001,7 @@ def list_connection_validations(self, workspace_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connection_validations got unknown kwargs: {extra_kwargs!r}") @@ -11011,10 +11010,10 @@ def list_connection_validations(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11041,14 +11040,14 @@ def list_connection_validations(self, workspace_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11167,7 +11166,7 @@ def list_connections(self, workspace_id, data_asset_key, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connections got unknown kwargs: {extra_kwargs!r}") @@ -11176,10 +11175,10 @@ def list_connections(self, workspace_id, data_asset_key, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11206,14 +11205,14 @@ def list_connections(self, workspace_id, data_asset_key, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11341,7 +11340,7 @@ def list_copy_object_requests(self, workspace_id, **kwargs): "time_started_in_millis", "time_ended_in_millis" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_copy_object_requests got unknown kwargs: {extra_kwargs!r}") @@ -11350,10 +11349,10 @@ def list_copy_object_requests(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -11395,14 +11394,14 @@ def list_copy_object_requests(self, workspace_id, **kwargs): "timeStartedInMillis": kwargs.get("time_started_in_millis", missing), "timeEndedInMillis": kwargs.get("time_ended_in_millis", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11518,7 +11517,7 @@ def list_data_assets(self, workspace_id, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_assets got unknown kwargs: {extra_kwargs!r}") @@ -11527,10 +11526,10 @@ def list_data_assets(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11556,14 +11555,14 @@ def list_data_assets(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11697,7 +11696,7 @@ def list_data_entities(self, workspace_id, connection_key, schema_resource_name, "is_pattern", "include_types" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_entities got unknown kwargs: {extra_kwargs!r}") @@ -11708,10 +11707,10 @@ def list_data_entities(self, workspace_id, connection_key, schema_resource_name, "schemaResourceName": schema_resource_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11740,14 +11739,14 @@ def list_data_entities(self, workspace_id, connection_key, schema_resource_name, "isPattern": kwargs.get("is_pattern", missing), "includeTypes": self.base_client.generate_collection_format_param(kwargs.get("include_types", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11867,7 +11866,7 @@ def list_data_flow_validations(self, workspace_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_flow_validations got unknown kwargs: {extra_kwargs!r}") @@ -11876,10 +11875,10 @@ def list_data_flow_validations(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11906,14 +11905,14 @@ def list_data_flow_validations(self, workspace_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12033,7 +12032,7 @@ def list_data_flows(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_flows got unknown kwargs: {extra_kwargs!r}") @@ -12042,10 +12041,10 @@ def list_data_flows(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12072,14 +12071,14 @@ def list_data_flows(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12214,7 +12213,7 @@ def list_dependent_objects(self, workspace_id, application_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dependent_objects got unknown kwargs: {extra_kwargs!r}") @@ -12224,10 +12223,10 @@ def list_dependent_objects(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12256,14 +12255,14 @@ def list_dependent_objects(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12394,7 +12393,7 @@ def list_dis_application_task_run_lineages(self, workspace_id, dis_application_i "time_upated_less_than", "time_upated_less_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dis_application_task_run_lineages got unknown kwargs: {extra_kwargs!r}") @@ -12404,10 +12403,10 @@ def list_dis_application_task_run_lineages(self, workspace_id, dis_application_i "disApplicationId": dis_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12436,14 +12435,14 @@ def list_dis_application_task_run_lineages(self, workspace_id, dis_application_i "timeUpatedLessThan": kwargs.get("time_upated_less_than", missing), "timeUpatedLessThanOrEqualTo": kwargs.get("time_upated_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12566,7 +12565,7 @@ def list_dis_applications(self, workspace_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dis_applications got unknown kwargs: {extra_kwargs!r}") @@ -12575,10 +12574,10 @@ def list_dis_applications(self, workspace_id, compartment_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12606,14 +12605,14 @@ def list_dis_applications(self, workspace_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12741,7 +12740,7 @@ def list_export_requests(self, workspace_id, **kwargs): "time_started_in_millis", "time_ended_in_millis" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_export_requests got unknown kwargs: {extra_kwargs!r}") @@ -12750,10 +12749,10 @@ def list_export_requests(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12795,14 +12794,14 @@ def list_export_requests(self, workspace_id, **kwargs): "timeStartedInMillis": kwargs.get("time_started_in_millis", missing), "timeEndedInMillis": kwargs.get("time_ended_in_millis", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12921,7 +12920,7 @@ def list_external_publication_validations(self, workspace_id, task_key, **kwargs "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_publication_validations got unknown kwargs: {extra_kwargs!r}") @@ -12931,10 +12930,10 @@ def list_external_publication_validations(self, workspace_id, task_key, **kwargs "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12960,14 +12959,14 @@ def list_external_publication_validations(self, workspace_id, task_key, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13082,7 +13081,7 @@ def list_external_publications(self, workspace_id, task_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_publications got unknown kwargs: {extra_kwargs!r}") @@ -13092,10 +13091,10 @@ def list_external_publications(self, workspace_id, task_key, **kwargs): "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13120,14 +13119,14 @@ def list_external_publications(self, workspace_id, task_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13251,7 +13250,7 @@ def list_folders(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_folders got unknown kwargs: {extra_kwargs!r}") @@ -13260,10 +13259,10 @@ def list_folders(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13291,14 +13290,14 @@ def list_folders(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13418,7 +13417,7 @@ def list_function_libraries(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_function_libraries got unknown kwargs: {extra_kwargs!r}") @@ -13427,10 +13426,10 @@ def list_function_libraries(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13457,14 +13456,14 @@ def list_function_libraries(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13592,7 +13591,7 @@ def list_import_requests(self, workspace_id, **kwargs): "time_started_in_millis", "time_ended_in_millis" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_import_requests got unknown kwargs: {extra_kwargs!r}") @@ -13601,10 +13600,10 @@ def list_import_requests(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13646,14 +13645,14 @@ def list_import_requests(self, workspace_id, **kwargs): "timeStartedInMillis": kwargs.get("time_started_in_millis", missing), "timeEndedInMillis": kwargs.get("time_ended_in_millis", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13772,7 +13771,7 @@ def list_patch_changes(self, workspace_id, application_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_patch_changes got unknown kwargs: {extra_kwargs!r}") @@ -13782,10 +13781,10 @@ def list_patch_changes(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13811,14 +13810,14 @@ def list_patch_changes(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13937,7 +13936,7 @@ def list_patches(self, workspace_id, application_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_patches got unknown kwargs: {extra_kwargs!r}") @@ -13947,10 +13946,10 @@ def list_patches(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13976,14 +13975,14 @@ def list_patches(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14103,7 +14102,7 @@ def list_pipeline_validations(self, workspace_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pipeline_validations got unknown kwargs: {extra_kwargs!r}") @@ -14112,10 +14111,10 @@ def list_pipeline_validations(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14142,14 +14141,14 @@ def list_pipeline_validations(self, workspace_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14269,7 +14268,7 @@ def list_pipelines(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -14278,10 +14277,10 @@ def list_pipelines(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -14308,14 +14307,14 @@ def list_pipelines(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14435,7 +14434,7 @@ def list_projects(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -14444,10 +14443,10 @@ def list_projects(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -14474,14 +14473,14 @@ def list_projects(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14620,7 +14619,7 @@ def list_published_objects(self, workspace_id, application_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_published_objects got unknown kwargs: {extra_kwargs!r}") @@ -14630,10 +14629,10 @@ def list_published_objects(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -14663,14 +14662,14 @@ def list_published_objects(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14781,7 +14780,7 @@ def list_references(self, workspace_id, application_key, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_references got unknown kwargs: {extra_kwargs!r}") @@ -14791,10 +14790,10 @@ def list_references(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -14818,14 +14817,14 @@ def list_references(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14955,7 +14954,7 @@ def list_runtime_operators(self, workspace_id, application_key, runtime_pipeline "sort_by", "aggregator_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_runtime_operators got unknown kwargs: {extra_kwargs!r}") @@ -14966,10 +14965,10 @@ def list_runtime_operators(self, workspace_id, application_key, runtime_pipeline "runtimePipelineKey": runtime_pipeline_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -14997,14 +14996,14 @@ def list_runtime_operators(self, workspace_id, application_key, runtime_pipeline "sortBy": kwargs.get("sort_by", missing), "aggregatorType": self.base_client.generate_collection_format_param(kwargs.get("aggregator_type", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15139,7 +15138,7 @@ def list_runtime_pipelines(self, workspace_id, application_key, **kwargs): "aggregator_type", "filter" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_runtime_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -15149,10 +15148,10 @@ def list_runtime_pipelines(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -15182,14 +15181,14 @@ def list_runtime_pipelines(self, workspace_id, application_key, **kwargs): "aggregatorType": self.base_client.generate_collection_format_param(kwargs.get("aggregator_type", missing), 'multi'), "filter": self.base_client.generate_collection_format_param(kwargs.get("filter", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15312,7 +15311,7 @@ def list_schedules(self, workspace_id, application_key, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_schedules got unknown kwargs: {extra_kwargs!r}") @@ -15322,10 +15321,10 @@ def list_schedules(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -15352,14 +15351,14 @@ def list_schedules(self, workspace_id, application_key, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15485,7 +15484,7 @@ def list_schemas(self, workspace_id, connection_key, schema_resource_name, **kwa "name_list", "include_types" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_schemas got unknown kwargs: {extra_kwargs!r}") @@ -15495,10 +15494,10 @@ def list_schemas(self, workspace_id, connection_key, schema_resource_name, **kwa "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -15526,14 +15525,14 @@ def list_schemas(self, workspace_id, connection_key, schema_resource_name, **kwa "nameList": self.base_client.generate_collection_format_param(kwargs.get("name_list", missing), 'multi'), "includeTypes": self.base_client.generate_collection_format_param(kwargs.get("include_types", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15664,7 +15663,7 @@ def list_task_run_lineages(self, workspace_id, application_key, **kwargs): "time_upated_less_than", "time_upated_less_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_task_run_lineages got unknown kwargs: {extra_kwargs!r}") @@ -15674,10 +15673,10 @@ def list_task_run_lineages(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -15706,14 +15705,14 @@ def list_task_run_lineages(self, workspace_id, application_key, **kwargs): "timeUpatedLessThan": kwargs.get("time_upated_less_than", missing), "timeUpatedLessThanOrEqualTo": kwargs.get("time_upated_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15823,7 +15822,7 @@ def list_task_run_logs(self, workspace_id, application_key, task_run_key, **kwar "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_task_run_logs got unknown kwargs: {extra_kwargs!r}") @@ -15834,10 +15833,10 @@ def list_task_run_logs(self, workspace_id, application_key, task_run_key, **kwar "taskRunKey": task_run_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -15860,14 +15859,14 @@ def list_task_run_logs(self, workspace_id, application_key, task_run_key, **kwar "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16006,7 +16005,7 @@ def list_task_runs(self, workspace_id, application_key, **kwargs): "name_starts_with", "name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_task_runs got unknown kwargs: {extra_kwargs!r}") @@ -16016,10 +16015,10 @@ def list_task_runs(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -16050,14 +16049,14 @@ def list_task_runs(self, workspace_id, application_key, **kwargs): "nameStartsWith": kwargs.get("name_starts_with", missing), "nameContains": kwargs.get("name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16184,7 +16183,7 @@ def list_task_schedules(self, workspace_id, application_key, **kwargs): "opc_request_id", "is_enabled" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_task_schedules got unknown kwargs: {extra_kwargs!r}") @@ -16194,10 +16193,10 @@ def list_task_schedules(self, workspace_id, application_key, **kwargs): "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16225,14 +16224,14 @@ def list_task_schedules(self, workspace_id, application_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "isEnabled": kwargs.get("is_enabled", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16352,7 +16351,7 @@ def list_task_validations(self, workspace_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_task_validations got unknown kwargs: {extra_kwargs!r}") @@ -16361,10 +16360,10 @@ def list_task_validations(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16391,14 +16390,14 @@ def list_task_validations(self, workspace_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16526,7 +16525,7 @@ def list_tasks(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tasks got unknown kwargs: {extra_kwargs!r}") @@ -16535,10 +16534,10 @@ def list_tasks(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -16567,14 +16566,14 @@ def list_tasks(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16690,7 +16689,7 @@ def list_templates(self, workspace_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_templates got unknown kwargs: {extra_kwargs!r}") @@ -16699,10 +16698,10 @@ def list_templates(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -16728,14 +16727,14 @@ def list_templates(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16855,7 +16854,7 @@ def list_user_defined_function_validations(self, workspace_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_defined_function_validations got unknown kwargs: {extra_kwargs!r}") @@ -16864,10 +16863,10 @@ def list_user_defined_function_validations(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16894,14 +16893,14 @@ def list_user_defined_function_validations(self, workspace_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17021,7 +17020,7 @@ def list_user_defined_functions(self, workspace_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_defined_functions got unknown kwargs: {extra_kwargs!r}") @@ -17030,10 +17029,10 @@ def list_user_defined_functions(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17060,14 +17059,14 @@ def list_user_defined_functions(self, workspace_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17171,7 +17170,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -17180,10 +17179,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17206,14 +17205,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17317,7 +17316,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -17326,10 +17325,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17352,14 +17351,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17473,7 +17472,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -17508,14 +17507,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17627,7 +17626,7 @@ def list_workspaces(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_workspaces got unknown kwargs: {extra_kwargs!r}") @@ -17662,14 +17661,14 @@ def list_workspaces(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17757,7 +17756,7 @@ def start_workspace(self, workspace_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_workspace got unknown kwargs: {extra_kwargs!r}") @@ -17766,10 +17765,10 @@ def start_workspace(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17779,7 +17778,7 @@ def start_workspace(self, workspace_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17874,7 +17873,7 @@ def stop_workspace(self, workspace_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_workspace got unknown kwargs: {extra_kwargs!r}") @@ -17883,17 +17882,17 @@ def stop_workspace(self, workspace_id, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "quiesceTimeout": kwargs.get("quiesce_timeout", missing), "isForceOperation": kwargs.get("is_force_operation", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17902,7 +17901,7 @@ def stop_workspace(self, workspace_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17993,7 +17992,7 @@ def update_application(self, workspace_id, application_key, update_application_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application got unknown kwargs: {extra_kwargs!r}") @@ -18003,10 +18002,10 @@ def update_application(self, workspace_id, application_key, update_application_d "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18015,7 +18014,7 @@ def update_application(self, workspace_id, application_key, update_application_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18107,7 +18106,7 @@ def update_application_detailed_description(self, workspace_id, application_key, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -18117,10 +18116,10 @@ def update_application_detailed_description(self, workspace_id, application_key, "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18129,7 +18128,7 @@ def update_application_detailed_description(self, workspace_id, application_key, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18221,7 +18220,7 @@ def update_connection(self, workspace_id, connection_key, update_connection_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connection got unknown kwargs: {extra_kwargs!r}") @@ -18231,10 +18230,10 @@ def update_connection(self, workspace_id, connection_key, update_connection_deta "connectionKey": connection_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18243,7 +18242,7 @@ def update_connection(self, workspace_id, connection_key, update_connection_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18335,7 +18334,7 @@ def update_copy_object_request(self, workspace_id, copy_object_request_key, upda "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_copy_object_request got unknown kwargs: {extra_kwargs!r}") @@ -18345,10 +18344,10 @@ def update_copy_object_request(self, workspace_id, copy_object_request_key, upda "copyObjectRequestKey": copy_object_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18357,7 +18356,7 @@ def update_copy_object_request(self, workspace_id, copy_object_request_key, upda "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18449,7 +18448,7 @@ def update_data_asset(self, workspace_id, data_asset_key, update_data_asset_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_asset got unknown kwargs: {extra_kwargs!r}") @@ -18459,10 +18458,10 @@ def update_data_asset(self, workspace_id, data_asset_key, update_data_asset_deta "dataAssetKey": data_asset_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18471,7 +18470,7 @@ def update_data_asset(self, workspace_id, data_asset_key, update_data_asset_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18563,7 +18562,7 @@ def update_data_flow(self, workspace_id, data_flow_key, update_data_flow_details "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_flow got unknown kwargs: {extra_kwargs!r}") @@ -18573,10 +18572,10 @@ def update_data_flow(self, workspace_id, data_flow_key, update_data_flow_details "dataFlowKey": data_flow_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18585,7 +18584,7 @@ def update_data_flow(self, workspace_id, data_flow_key, update_data_flow_details "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18677,7 +18676,7 @@ def update_dis_application(self, workspace_id, dis_application_id, update_dis_ap "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dis_application got unknown kwargs: {extra_kwargs!r}") @@ -18687,10 +18686,10 @@ def update_dis_application(self, workspace_id, dis_application_id, update_dis_ap "disApplicationId": dis_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18699,7 +18698,7 @@ def update_dis_application(self, workspace_id, dis_application_id, update_dis_ap "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18791,7 +18790,7 @@ def update_dis_application_detailed_description(self, workspace_id, application_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dis_application_detailed_description got unknown kwargs: {extra_kwargs!r}") @@ -18801,10 +18800,10 @@ def update_dis_application_detailed_description(self, workspace_id, application_ "applicationKey": application_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18813,7 +18812,7 @@ def update_dis_application_detailed_description(self, workspace_id, application_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18905,7 +18904,7 @@ def update_export_request(self, workspace_id, export_request_key, update_export_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_export_request got unknown kwargs: {extra_kwargs!r}") @@ -18915,10 +18914,10 @@ def update_export_request(self, workspace_id, export_request_key, update_export_ "exportRequestKey": export_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18927,7 +18926,7 @@ def update_export_request(self, workspace_id, export_request_key, update_export_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19022,7 +19021,7 @@ def update_external_publication(self, workspace_id, task_key, external_publicati "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_publication got unknown kwargs: {extra_kwargs!r}") @@ -19033,10 +19032,10 @@ def update_external_publication(self, workspace_id, task_key, external_publicati "externalPublicationsKey": external_publications_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19045,7 +19044,7 @@ def update_external_publication(self, workspace_id, task_key, external_publicati "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19137,7 +19136,7 @@ def update_folder(self, workspace_id, folder_key, update_folder_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_folder got unknown kwargs: {extra_kwargs!r}") @@ -19147,10 +19146,10 @@ def update_folder(self, workspace_id, folder_key, update_folder_details, **kwarg "folderKey": folder_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19159,7 +19158,7 @@ def update_folder(self, workspace_id, folder_key, update_folder_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19251,7 +19250,7 @@ def update_function_library(self, workspace_id, function_library_key, update_fun "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_function_library got unknown kwargs: {extra_kwargs!r}") @@ -19261,10 +19260,10 @@ def update_function_library(self, workspace_id, function_library_key, update_fun "functionLibraryKey": function_library_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19273,7 +19272,7 @@ def update_function_library(self, workspace_id, function_library_key, update_fun "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19365,7 +19364,7 @@ def update_import_request(self, workspace_id, import_request_key, update_import_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_import_request got unknown kwargs: {extra_kwargs!r}") @@ -19375,10 +19374,10 @@ def update_import_request(self, workspace_id, import_request_key, update_import_ "importRequestKey": import_request_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19387,7 +19386,7 @@ def update_import_request(self, workspace_id, import_request_key, update_import_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19479,7 +19478,7 @@ def update_pipeline(self, workspace_id, pipeline_key, update_pipeline_details, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -19489,10 +19488,10 @@ def update_pipeline(self, workspace_id, pipeline_key, update_pipeline_details, * "pipelineKey": pipeline_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19501,7 +19500,7 @@ def update_pipeline(self, workspace_id, pipeline_key, update_pipeline_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19593,7 +19592,7 @@ def update_project(self, workspace_id, project_key, update_project_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -19603,10 +19602,10 @@ def update_project(self, workspace_id, project_key, update_project_details, **kw "projectKey": project_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19615,7 +19614,7 @@ def update_project(self, workspace_id, project_key, update_project_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19714,7 +19713,7 @@ def update_reference(self, workspace_id, application_key, reference_key, update_ "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_reference got unknown kwargs: {extra_kwargs!r}") @@ -19725,10 +19724,10 @@ def update_reference(self, workspace_id, application_key, reference_key, update_ "referenceKey": reference_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19738,7 +19737,7 @@ def update_reference(self, workspace_id, application_key, reference_key, update_ "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19834,7 +19833,7 @@ def update_schedule(self, workspace_id, application_key, schedule_key, update_sc "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_schedule got unknown kwargs: {extra_kwargs!r}") @@ -19845,10 +19844,10 @@ def update_schedule(self, workspace_id, application_key, schedule_key, update_sc "scheduleKey": schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19857,7 +19856,7 @@ def update_schedule(self, workspace_id, application_key, schedule_key, update_sc "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19949,7 +19948,7 @@ def update_task(self, workspace_id, task_key, update_task_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_task got unknown kwargs: {extra_kwargs!r}") @@ -19959,10 +19958,10 @@ def update_task(self, workspace_id, task_key, update_task_details, **kwargs): "taskKey": task_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19971,7 +19970,7 @@ def update_task(self, workspace_id, task_key, update_task_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20066,7 +20065,7 @@ def update_task_run(self, workspace_id, application_key, task_run_key, update_ta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_task_run got unknown kwargs: {extra_kwargs!r}") @@ -20077,10 +20076,10 @@ def update_task_run(self, workspace_id, application_key, task_run_key, update_ta "taskRunKey": task_run_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20089,7 +20088,7 @@ def update_task_run(self, workspace_id, application_key, task_run_key, update_ta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20184,7 +20183,7 @@ def update_task_schedule(self, workspace_id, application_key, task_schedule_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -20195,10 +20194,10 @@ def update_task_schedule(self, workspace_id, application_key, task_schedule_key, "taskScheduleKey": task_schedule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20207,7 +20206,7 @@ def update_task_schedule(self, workspace_id, application_key, task_schedule_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20299,7 +20298,7 @@ def update_user_defined_function(self, workspace_id, user_defined_function_key, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_user_defined_function got unknown kwargs: {extra_kwargs!r}") @@ -20309,10 +20308,10 @@ def update_user_defined_function(self, workspace_id, user_defined_function_key, "userDefinedFunctionKey": user_defined_function_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20321,7 +20320,7 @@ def update_user_defined_function(self, workspace_id, user_defined_function_key, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20410,7 +20409,7 @@ def update_workspace(self, workspace_id, update_workspace_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_workspace got unknown kwargs: {extra_kwargs!r}") @@ -20419,10 +20418,10 @@ def update_workspace(self, workspace_id, update_workspace_details, **kwargs): "workspaceId": workspace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20431,7 +20430,7 @@ def update_workspace(self, workspace_id, update_workspace_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_labeling_service/data_labeling_management_client.py b/src/oci/data_labeling_service/data_labeling_management_client.py index d3fe44b5c2..e5f73e2ec8 100644 --- a/src/oci/data_labeling_service/data_labeling_management_client.py +++ b/src/oci/data_labeling_service/data_labeling_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def add_dataset_labels(self, dataset_id, add_dataset_labels_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_dataset_labels got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def add_dataset_labels(self, dataset_id, add_dataset_labels_details, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def add_dataset_labels(self, dataset_id, add_dataset_labels_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def change_dataset_compartment(self, dataset_id, change_dataset_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dataset_compartment got unknown kwargs: {extra_kwargs!r}") @@ -298,10 +297,10 @@ def change_dataset_compartment(self, dataset_id, change_dataset_compartment_deta "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -310,7 +309,7 @@ def change_dataset_compartment(self, dataset_id, change_dataset_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -396,7 +395,7 @@ def create_dataset(self, create_dataset_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dataset got unknown kwargs: {extra_kwargs!r}") @@ -407,7 +406,7 @@ def create_dataset(self, create_dataset_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -494,7 +493,7 @@ def delete_dataset(self, dataset_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dataset got unknown kwargs: {extra_kwargs!r}") @@ -503,10 +502,10 @@ def delete_dataset(self, dataset_id, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -515,7 +514,7 @@ def delete_dataset(self, dataset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -610,7 +609,7 @@ def generate_dataset_records(self, dataset_id, generate_dataset_records_details, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_dataset_records got unknown kwargs: {extra_kwargs!r}") @@ -619,10 +618,10 @@ def generate_dataset_records(self, dataset_id, generate_dataset_records_details, "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -632,7 +631,7 @@ def generate_dataset_records(self, dataset_id, generate_dataset_records_details, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -711,7 +710,7 @@ def get_dataset(self, dataset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dataset got unknown kwargs: {extra_kwargs!r}") @@ -720,10 +719,10 @@ def get_dataset(self, dataset_id, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -731,7 +730,7 @@ def get_dataset(self, dataset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -809,7 +808,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -818,10 +817,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -829,7 +828,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -926,7 +925,7 @@ def import_pre_annotated_data(self, dataset_id, import_pre_annotated_data_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_pre_annotated_data got unknown kwargs: {extra_kwargs!r}") @@ -935,10 +934,10 @@ def import_pre_annotated_data(self, dataset_id, import_pre_annotated_data_detail "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -948,7 +947,7 @@ def import_pre_annotated_data(self, dataset_id, import_pre_annotated_data_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1041,7 +1040,7 @@ def list_annotation_formats(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_annotation_formats got unknown kwargs: {extra_kwargs!r}") @@ -1059,14 +1058,14 @@ def list_annotation_formats(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1182,7 +1181,7 @@ def list_datasets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_datasets got unknown kwargs: {extra_kwargs!r}") @@ -1219,14 +1218,14 @@ def list_datasets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1312,7 +1311,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1321,24 +1320,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1426,7 +1425,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1435,24 +1434,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1544,7 +1543,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1555,14 +1554,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1659,7 +1658,7 @@ def remove_dataset_labels(self, dataset_id, remove_dataset_labels_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_dataset_labels got unknown kwargs: {extra_kwargs!r}") @@ -1668,10 +1667,10 @@ def remove_dataset_labels(self, dataset_id, remove_dataset_labels_details, **kwa "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1681,7 +1680,7 @@ def remove_dataset_labels(self, dataset_id, remove_dataset_labels_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1779,7 +1778,7 @@ def rename_dataset_labels(self, dataset_id, rename_dataset_labels_details, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rename_dataset_labels got unknown kwargs: {extra_kwargs!r}") @@ -1788,10 +1787,10 @@ def rename_dataset_labels(self, dataset_id, rename_dataset_labels_details, **kwa "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1801,7 +1800,7 @@ def rename_dataset_labels(self, dataset_id, rename_dataset_labels_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1900,7 +1899,7 @@ def snapshot_dataset(self, dataset_id, snapshot_dataset_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"snapshot_dataset got unknown kwargs: {extra_kwargs!r}") @@ -1909,10 +1908,10 @@ def snapshot_dataset(self, dataset_id, snapshot_dataset_details, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1922,7 +1921,7 @@ def snapshot_dataset(self, dataset_id, snapshot_dataset_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2012,7 +2011,7 @@ def update_dataset(self, dataset_id, update_dataset_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dataset got unknown kwargs: {extra_kwargs!r}") @@ -2021,10 +2020,10 @@ def update_dataset(self, dataset_id, update_dataset_details, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2033,7 +2032,7 @@ def update_dataset(self, dataset_id, update_dataset_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_labeling_service_dataplane/data_labeling_client.py b/src/oci/data_labeling_service_dataplane/data_labeling_client.py index 5579c0f502..43ffacbddf 100644 --- a/src/oci/data_labeling_service_dataplane/data_labeling_client.py +++ b/src/oci/data_labeling_service_dataplane/data_labeling_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_annotation(self, create_annotation_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_annotation got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_annotation(self, create_annotation_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -264,7 +263,7 @@ def create_record(self, create_record_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_record got unknown kwargs: {extra_kwargs!r}") @@ -275,7 +274,7 @@ def create_record(self, create_record_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -362,7 +361,7 @@ def delete_annotation(self, annotation_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_annotation got unknown kwargs: {extra_kwargs!r}") @@ -371,10 +370,10 @@ def delete_annotation(self, annotation_id, **kwargs): "annotationId": annotation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -383,7 +382,7 @@ def delete_annotation(self, annotation_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -467,7 +466,7 @@ def delete_record(self, record_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_record got unknown kwargs: {extra_kwargs!r}") @@ -476,10 +475,10 @@ def delete_record(self, record_id, **kwargs): "recordId": record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -488,7 +487,7 @@ def delete_record(self, record_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def get_annotation(self, annotation_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_annotation got unknown kwargs: {extra_kwargs!r}") @@ -573,10 +572,10 @@ def get_annotation(self, annotation_id, **kwargs): "annotationId": annotation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -584,7 +583,7 @@ def get_annotation(self, annotation_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -662,7 +661,7 @@ def get_dataset(self, dataset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dataset got unknown kwargs: {extra_kwargs!r}") @@ -671,10 +670,10 @@ def get_dataset(self, dataset_id, **kwargs): "datasetId": dataset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -682,7 +681,7 @@ def get_dataset(self, dataset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -760,7 +759,7 @@ def get_record(self, record_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_record got unknown kwargs: {extra_kwargs!r}") @@ -769,10 +768,10 @@ def get_record(self, record_id, **kwargs): "recordId": record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -780,7 +779,7 @@ def get_record(self, record_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -866,7 +865,7 @@ def get_record_content(self, record_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_record_content got unknown kwargs: {extra_kwargs!r}") @@ -875,10 +874,10 @@ def get_record_content(self, record_id, **kwargs): "recordId": record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -887,7 +886,7 @@ def get_record_content(self, record_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -973,7 +972,7 @@ def get_record_preview_content(self, record_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_record_preview_content got unknown kwargs: {extra_kwargs!r}") @@ -982,10 +981,10 @@ def get_record_preview_content(self, record_id, **kwargs): "recordId": record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -994,7 +993,7 @@ def get_record_preview_content(self, record_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1121,7 +1120,7 @@ def list_annotations(self, compartment_id, dataset_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_annotations got unknown kwargs: {extra_kwargs!r}") @@ -1161,14 +1160,14 @@ def list_annotations(self, compartment_id, dataset_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1291,7 +1290,7 @@ def list_records(self, compartment_id, dataset_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_records got unknown kwargs: {extra_kwargs!r}") @@ -1330,14 +1329,14 @@ def list_records(self, compartment_id, dataset_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1454,7 +1453,7 @@ def summarize_annotation_analytics(self, compartment_id, dataset_id, **kwargs): "annotation_group_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_annotation_analytics got unknown kwargs: {extra_kwargs!r}") @@ -1498,14 +1497,14 @@ def summarize_annotation_analytics(self, compartment_id, dataset_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "annotationGroupBy": kwargs.get("annotation_group_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1618,7 +1617,7 @@ def summarize_record_analytics(self, compartment_id, dataset_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_record_analytics got unknown kwargs: {extra_kwargs!r}") @@ -1661,14 +1660,14 @@ def summarize_record_analytics(self, compartment_id, dataset_id, **kwargs): "recordGroupBy": kwargs.get("record_group_by", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1757,7 +1756,7 @@ def update_annotation(self, annotation_id, update_annotation_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_annotation got unknown kwargs: {extra_kwargs!r}") @@ -1766,10 +1765,10 @@ def update_annotation(self, annotation_id, update_annotation_details, **kwargs): "annotationId": annotation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1778,7 +1777,7 @@ def update_annotation(self, annotation_id, update_annotation_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1869,7 +1868,7 @@ def update_record(self, record_id, update_record_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_record got unknown kwargs: {extra_kwargs!r}") @@ -1878,10 +1877,10 @@ def update_record(self, record_id, update_record_details, **kwargs): "recordId": record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1890,7 +1889,7 @@ def update_record(self, record_id, update_record_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/data_safe/data_safe_client.py b/src/oci/data_safe/data_safe_client.py index 9d92c8ec3c..063ae72075 100644 --- a/src/oci/data_safe/data_safe_client.py +++ b/src/oci/data_safe/data_safe_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def activate_target_database(self, activate_target_database_details, target_data "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_target_database got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def activate_target_database(self, activate_target_database_details, target_data "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def activate_target_database(self, activate_target_database_details, target_data "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def add_masking_columns_from_sdm(self, masking_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_masking_columns_from_sdm got unknown kwargs: {extra_kwargs!r}") @@ -298,10 +297,10 @@ def add_masking_columns_from_sdm(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -310,7 +309,7 @@ def add_masking_columns_from_sdm(self, masking_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -415,7 +414,7 @@ def alerts_update(self, alerts_update_details, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"alerts_update got unknown kwargs: {extra_kwargs!r}") @@ -431,7 +430,7 @@ def alerts_update(self, alerts_update_details, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -440,7 +439,7 @@ def alerts_update(self, alerts_update_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -533,7 +532,7 @@ def apply_discovery_job_results(self, sensitive_data_model_id, apply_discovery_j "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"apply_discovery_job_results got unknown kwargs: {extra_kwargs!r}") @@ -542,10 +541,10 @@ def apply_discovery_job_results(self, sensitive_data_model_id, apply_discovery_j "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -554,7 +553,7 @@ def apply_discovery_job_results(self, sensitive_data_model_id, apply_discovery_j "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -655,7 +654,7 @@ def apply_sdm_masking_policy_difference(self, masking_policy_id, apply_sdm_maski "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"apply_sdm_masking_policy_difference got unknown kwargs: {extra_kwargs!r}") @@ -664,10 +663,10 @@ def apply_sdm_masking_policy_difference(self, masking_policy_id, apply_sdm_maski "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -677,7 +676,7 @@ def apply_sdm_masking_policy_difference(self, masking_policy_id, apply_sdm_maski "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -774,7 +773,7 @@ def calculate_audit_volume_available(self, audit_profile_id, calculate_audit_vol "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"calculate_audit_volume_available got unknown kwargs: {extra_kwargs!r}") @@ -783,10 +782,10 @@ def calculate_audit_volume_available(self, audit_profile_id, calculate_audit_vol "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -796,7 +795,7 @@ def calculate_audit_volume_available(self, audit_profile_id, calculate_audit_vol "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -893,7 +892,7 @@ def calculate_audit_volume_collected(self, audit_profile_id, calculate_audit_vol "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"calculate_audit_volume_collected got unknown kwargs: {extra_kwargs!r}") @@ -902,10 +901,10 @@ def calculate_audit_volume_collected(self, audit_profile_id, calculate_audit_vol "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -915,7 +914,7 @@ def calculate_audit_volume_collected(self, audit_profile_id, calculate_audit_vol "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1009,7 +1008,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1018,10 +1017,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1031,7 +1030,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1126,7 +1125,7 @@ def change_alert_compartment(self, alert_id, change_alert_compartment_details, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_alert_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1135,10 +1134,10 @@ def change_alert_compartment(self, alert_id, change_alert_compartment_details, * "alertId": alert_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1148,7 +1147,7 @@ def change_alert_compartment(self, alert_id, change_alert_compartment_details, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1245,7 +1244,7 @@ def change_audit_archive_retrieval_compartment(self, audit_archive_retrieval_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_audit_archive_retrieval_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1254,10 +1253,10 @@ def change_audit_archive_retrieval_compartment(self, audit_archive_retrieval_id, "auditArchiveRetrievalId": audit_archive_retrieval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1267,7 +1266,7 @@ def change_audit_archive_retrieval_compartment(self, audit_archive_retrieval_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1364,7 +1363,7 @@ def change_audit_policy_compartment(self, audit_policy_id, change_audit_policy_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_audit_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1373,10 +1372,10 @@ def change_audit_policy_compartment(self, audit_policy_id, change_audit_policy_c "auditPolicyId": audit_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1386,7 +1385,7 @@ def change_audit_policy_compartment(self, audit_policy_id, change_audit_policy_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1483,7 +1482,7 @@ def change_audit_profile_compartment(self, audit_profile_id, change_audit_profil "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_audit_profile_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1492,10 +1491,10 @@ def change_audit_profile_compartment(self, audit_profile_id, change_audit_profil "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1505,7 +1504,7 @@ def change_audit_profile_compartment(self, audit_profile_id, change_audit_profil "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1595,7 +1594,7 @@ def change_data_safe_private_endpoint_compartment(self, data_safe_private_endpoi "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_data_safe_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1604,10 +1603,10 @@ def change_data_safe_private_endpoint_compartment(self, data_safe_private_endpoi "dataSafePrivateEndpointId": data_safe_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1616,7 +1615,7 @@ def change_data_safe_private_endpoint_compartment(self, data_safe_private_endpoi "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1712,7 +1711,7 @@ def change_database_security_config_compartment(self, database_security_config_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_security_config_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1721,10 +1720,10 @@ def change_database_security_config_compartment(self, database_security_config_i "databaseSecurityConfigId": database_security_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1734,7 +1733,7 @@ def change_database_security_config_compartment(self, database_security_config_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1831,7 +1830,7 @@ def change_discovery_job_compartment(self, discovery_job_id, change_discovery_jo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_discovery_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1840,10 +1839,10 @@ def change_discovery_job_compartment(self, discovery_job_id, change_discovery_jo "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1853,7 +1852,7 @@ def change_discovery_job_compartment(self, discovery_job_id, change_discovery_jo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1950,7 +1949,7 @@ def change_library_masking_format_compartment(self, library_masking_format_id, c "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_library_masking_format_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1959,10 +1958,10 @@ def change_library_masking_format_compartment(self, library_masking_format_id, c "libraryMaskingFormatId": library_masking_format_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1972,7 +1971,7 @@ def change_library_masking_format_compartment(self, library_masking_format_id, c "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2069,7 +2068,7 @@ def change_masking_policy_compartment(self, masking_policy_id, change_masking_po "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_masking_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2078,10 +2077,10 @@ def change_masking_policy_compartment(self, masking_policy_id, change_masking_po "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2091,7 +2090,7 @@ def change_masking_policy_compartment(self, masking_policy_id, change_masking_po "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2188,7 +2187,7 @@ def change_on_prem_connector_compartment(self, on_prem_connector_id, change_on_p "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_on_prem_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2197,10 +2196,10 @@ def change_on_prem_connector_compartment(self, on_prem_connector_id, change_on_p "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2210,7 +2209,7 @@ def change_on_prem_connector_compartment(self, on_prem_connector_id, change_on_p "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2307,7 +2306,7 @@ def change_report_compartment(self, report_id, change_report_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_report_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2316,10 +2315,10 @@ def change_report_compartment(self, report_id, change_report_compartment_details "reportId": report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2329,7 +2328,7 @@ def change_report_compartment(self, report_id, change_report_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2426,7 +2425,7 @@ def change_report_definition_compartment(self, report_definition_id, change_repo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_report_definition_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2435,10 +2434,10 @@ def change_report_definition_compartment(self, report_definition_id, change_repo "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2448,7 +2447,7 @@ def change_report_definition_compartment(self, report_definition_id, change_repo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2545,7 +2544,7 @@ def change_retention(self, audit_profile_id, change_retention_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_retention got unknown kwargs: {extra_kwargs!r}") @@ -2554,10 +2553,10 @@ def change_retention(self, audit_profile_id, change_retention_details, **kwargs) "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2567,7 +2566,7 @@ def change_retention(self, audit_profile_id, change_retention_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2664,7 +2663,7 @@ def change_sdm_masking_policy_difference_compartment(self, sdm_masking_policy_di "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sdm_masking_policy_difference_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2673,10 +2672,10 @@ def change_sdm_masking_policy_difference_compartment(self, sdm_masking_policy_di "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2686,7 +2685,7 @@ def change_sdm_masking_policy_difference_compartment(self, sdm_masking_policy_di "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2787,7 +2786,7 @@ def change_security_assessment_compartment(self, security_assessment_id, change_ "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_assessment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2796,10 +2795,10 @@ def change_security_assessment_compartment(self, security_assessment_id, change_ "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2809,7 +2808,7 @@ def change_security_assessment_compartment(self, security_assessment_id, change_ "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2906,7 +2905,7 @@ def change_security_policy_compartment(self, security_policy_id, change_security "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2915,10 +2914,10 @@ def change_security_policy_compartment(self, security_policy_id, change_security "securityPolicyId": security_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2928,7 +2927,7 @@ def change_security_policy_compartment(self, security_policy_id, change_security "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3025,7 +3024,7 @@ def change_security_policy_deployment_compartment(self, security_policy_deployme "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_security_policy_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3034,10 +3033,10 @@ def change_security_policy_deployment_compartment(self, security_policy_deployme "securityPolicyDeploymentId": security_policy_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3047,7 +3046,7 @@ def change_security_policy_deployment_compartment(self, security_policy_deployme "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3144,7 +3143,7 @@ def change_sensitive_data_model_compartment(self, sensitive_data_model_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sensitive_data_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3153,10 +3152,10 @@ def change_sensitive_data_model_compartment(self, sensitive_data_model_id, chang "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3166,7 +3165,7 @@ def change_sensitive_data_model_compartment(self, sensitive_data_model_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3263,7 +3262,7 @@ def change_sensitive_type_compartment(self, sensitive_type_id, change_sensitive_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sensitive_type_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3272,10 +3271,10 @@ def change_sensitive_type_compartment(self, sensitive_type_id, change_sensitive_ "sensitiveTypeId": sensitive_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3285,7 +3284,7 @@ def change_sensitive_type_compartment(self, sensitive_type_id, change_sensitive_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3382,7 +3381,7 @@ def change_sql_collection_compartment(self, sql_collection_id, change_sql_collec "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sql_collection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3391,10 +3390,10 @@ def change_sql_collection_compartment(self, sql_collection_id, change_sql_collec "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3404,7 +3403,7 @@ def change_sql_collection_compartment(self, sql_collection_id, change_sql_collec "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3501,7 +3500,7 @@ def change_sql_firewall_policy_compartment(self, sql_firewall_policy_id, change_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sql_firewall_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3510,10 +3509,10 @@ def change_sql_firewall_policy_compartment(self, sql_firewall_policy_id, change_ "sqlFirewallPolicyId": sql_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3523,7 +3522,7 @@ def change_sql_firewall_policy_compartment(self, sql_firewall_policy_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3620,7 +3619,7 @@ def change_target_alert_policy_association_compartment(self, target_alert_policy "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_target_alert_policy_association_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3629,10 +3628,10 @@ def change_target_alert_policy_association_compartment(self, target_alert_policy "targetAlertPolicyAssociationId": target_alert_policy_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3642,7 +3641,7 @@ def change_target_alert_policy_association_compartment(self, target_alert_policy "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3739,7 +3738,7 @@ def change_target_database_compartment(self, target_database_id, change_target_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_target_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3748,10 +3747,10 @@ def change_target_database_compartment(self, target_database_id, change_target_d "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3761,7 +3760,7 @@ def change_target_database_compartment(self, target_database_id, change_target_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3862,7 +3861,7 @@ def change_user_assessment_compartment(self, user_assessment_id, change_user_ass "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_user_assessment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3871,10 +3870,10 @@ def change_user_assessment_compartment(self, user_assessment_id, change_user_ass "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3884,7 +3883,7 @@ def change_user_assessment_compartment(self, user_assessment_id, change_user_ass "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3982,7 +3981,7 @@ def compare_security_assessment(self, security_assessment_id, compare_security_a "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"compare_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -3991,10 +3990,10 @@ def compare_security_assessment(self, security_assessment_id, compare_security_a "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4004,7 +4003,7 @@ def compare_security_assessment(self, security_assessment_id, compare_security_a "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4102,7 +4101,7 @@ def compare_user_assessment(self, user_assessment_id, compare_user_assessment_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"compare_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -4111,10 +4110,10 @@ def compare_user_assessment(self, user_assessment_id, compare_user_assessment_de "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4124,7 +4123,7 @@ def compare_user_assessment(self, user_assessment_id, compare_user_assessment_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4212,7 +4211,7 @@ def create_audit_archive_retrieval(self, create_audit_archive_retrieval_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_audit_archive_retrieval got unknown kwargs: {extra_kwargs!r}") @@ -4223,7 +4222,7 @@ def create_audit_archive_retrieval(self, create_audit_archive_retrieval_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4309,7 +4308,7 @@ def create_data_safe_private_endpoint(self, create_data_safe_private_endpoint_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_safe_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4320,7 +4319,7 @@ def create_data_safe_private_endpoint(self, create_data_safe_private_endpoint_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4410,7 +4409,7 @@ def create_discovery_job(self, create_discovery_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -4421,7 +4420,7 @@ def create_discovery_job(self, create_discovery_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4511,7 +4510,7 @@ def create_library_masking_format(self, create_library_masking_format_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_library_masking_format got unknown kwargs: {extra_kwargs!r}") @@ -4522,7 +4521,7 @@ def create_library_masking_format(self, create_library_masking_format_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4630,7 +4629,7 @@ def create_masking_column(self, create_masking_column_details, masking_policy_id "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_masking_column got unknown kwargs: {extra_kwargs!r}") @@ -4639,10 +4638,10 @@ def create_masking_column(self, create_masking_column_details, masking_policy_id "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4651,7 +4650,7 @@ def create_masking_column(self, create_masking_column_details, masking_policy_id "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4753,7 +4752,7 @@ def create_masking_policy(self, create_masking_policy_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -4764,7 +4763,7 @@ def create_masking_policy(self, create_masking_policy_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4850,7 +4849,7 @@ def create_on_prem_connector(self, create_on_prem_connector_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_on_prem_connector got unknown kwargs: {extra_kwargs!r}") @@ -4861,7 +4860,7 @@ def create_on_prem_connector(self, create_on_prem_connector_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4958,7 +4957,7 @@ def create_peer_target_database(self, target_database_id, create_peer_target_dat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_peer_target_database got unknown kwargs: {extra_kwargs!r}") @@ -4967,10 +4966,10 @@ def create_peer_target_database(self, target_database_id, create_peer_target_dat "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4980,7 +4979,7 @@ def create_peer_target_database(self, target_database_id, create_peer_target_dat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5068,7 +5067,7 @@ def create_report_definition(self, create_report_definition_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_report_definition got unknown kwargs: {extra_kwargs!r}") @@ -5079,7 +5078,7 @@ def create_report_definition(self, create_report_definition_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5169,7 +5168,7 @@ def create_sdm_masking_policy_difference(self, create_sdm_masking_policy_differe "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sdm_masking_policy_difference got unknown kwargs: {extra_kwargs!r}") @@ -5180,7 +5179,7 @@ def create_sdm_masking_policy_difference(self, create_sdm_masking_policy_differe "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5270,7 +5269,7 @@ def create_security_assessment(self, create_security_assessment_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -5281,7 +5280,7 @@ def create_security_assessment(self, create_security_assessment_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5370,7 +5369,7 @@ def create_sensitive_column(self, sensitive_data_model_id, create_sensitive_colu "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sensitive_column got unknown kwargs: {extra_kwargs!r}") @@ -5379,10 +5378,10 @@ def create_sensitive_column(self, sensitive_data_model_id, create_sensitive_colu "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5391,7 +5390,7 @@ def create_sensitive_column(self, sensitive_data_model_id, create_sensitive_colu "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5479,7 +5478,7 @@ def create_sensitive_data_model(self, create_sensitive_data_model_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -5490,7 +5489,7 @@ def create_sensitive_data_model(self, create_sensitive_data_model_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5578,7 +5577,7 @@ def create_sensitive_type(self, create_sensitive_type_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sensitive_type got unknown kwargs: {extra_kwargs!r}") @@ -5589,7 +5588,7 @@ def create_sensitive_type(self, create_sensitive_type_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5675,7 +5674,7 @@ def create_sql_collection(self, create_sql_collection_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -5686,7 +5685,7 @@ def create_sql_collection(self, create_sql_collection_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5772,7 +5771,7 @@ def create_target_alert_policy_association(self, create_target_alert_policy_asso "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target_alert_policy_association got unknown kwargs: {extra_kwargs!r}") @@ -5783,7 +5782,7 @@ def create_target_alert_policy_association(self, create_target_alert_policy_asso "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5869,7 +5868,7 @@ def create_target_database(self, create_target_database_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_target_database got unknown kwargs: {extra_kwargs!r}") @@ -5880,7 +5879,7 @@ def create_target_database(self, create_target_database_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5970,7 +5969,7 @@ def create_user_assessment(self, create_user_assessment_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -5981,7 +5980,7 @@ def create_user_assessment(self, create_user_assessment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6075,7 +6074,7 @@ def deactivate_target_database(self, target_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_target_database got unknown kwargs: {extra_kwargs!r}") @@ -6084,10 +6083,10 @@ def deactivate_target_database(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6097,7 +6096,7 @@ def deactivate_target_database(self, target_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6183,7 +6182,7 @@ def delete_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_audit_archive_retrieval got unknown kwargs: {extra_kwargs!r}") @@ -6192,10 +6191,10 @@ def delete_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "auditArchiveRetrievalId": audit_archive_retrieval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6204,7 +6203,7 @@ def delete_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6288,7 +6287,7 @@ def delete_audit_trail(self, audit_trail_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -6297,10 +6296,10 @@ def delete_audit_trail(self, audit_trail_id, **kwargs): "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6309,7 +6308,7 @@ def delete_audit_trail(self, audit_trail_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6393,7 +6392,7 @@ def delete_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_safe_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6402,10 +6401,10 @@ def delete_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwa "dataSafePrivateEndpointId": data_safe_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6414,7 +6413,7 @@ def delete_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6498,7 +6497,7 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -6507,10 +6506,10 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6519,7 +6518,7 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6606,7 +6605,7 @@ def delete_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_discovery_job_result got unknown kwargs: {extra_kwargs!r}") @@ -6616,10 +6615,10 @@ def delete_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "resultKey": result_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6628,7 +6627,7 @@ def delete_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6712,7 +6711,7 @@ def delete_library_masking_format(self, library_masking_format_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_library_masking_format got unknown kwargs: {extra_kwargs!r}") @@ -6721,10 +6720,10 @@ def delete_library_masking_format(self, library_masking_format_id, **kwargs): "libraryMaskingFormatId": library_masking_format_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6733,7 +6732,7 @@ def delete_library_masking_format(self, library_masking_format_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6820,7 +6819,7 @@ def delete_masking_column(self, masking_column_key, masking_policy_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_masking_column got unknown kwargs: {extra_kwargs!r}") @@ -6830,10 +6829,10 @@ def delete_masking_column(self, masking_column_key, masking_policy_id, **kwargs) "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6842,7 +6841,7 @@ def delete_masking_column(self, masking_column_key, masking_policy_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6926,7 +6925,7 @@ def delete_masking_policy(self, masking_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -6935,10 +6934,10 @@ def delete_masking_policy(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6947,7 +6946,7 @@ def delete_masking_policy(self, masking_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7031,7 +7030,7 @@ def delete_on_prem_connector(self, on_prem_connector_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_on_prem_connector got unknown kwargs: {extra_kwargs!r}") @@ -7040,10 +7039,10 @@ def delete_on_prem_connector(self, on_prem_connector_id, **kwargs): "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7052,7 +7051,7 @@ def delete_on_prem_connector(self, on_prem_connector_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7139,7 +7138,7 @@ def delete_peer_target_database(self, target_database_id, peer_target_database_i "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_peer_target_database got unknown kwargs: {extra_kwargs!r}") @@ -7149,10 +7148,10 @@ def delete_peer_target_database(self, target_database_id, peer_target_database_i "peerTargetDatabaseId": peer_target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7161,7 +7160,7 @@ def delete_peer_target_database(self, target_database_id, peer_target_database_i "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7245,7 +7244,7 @@ def delete_report_definition(self, report_definition_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_report_definition got unknown kwargs: {extra_kwargs!r}") @@ -7254,10 +7253,10 @@ def delete_report_definition(self, report_definition_id, **kwargs): "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7266,7 +7265,7 @@ def delete_report_definition(self, report_definition_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7350,7 +7349,7 @@ def delete_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sdm_masking_policy_difference got unknown kwargs: {extra_kwargs!r}") @@ -7359,10 +7358,10 @@ def delete_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7371,7 +7370,7 @@ def delete_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7458,7 +7457,7 @@ def delete_security_assessment(self, security_assessment_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -7467,10 +7466,10 @@ def delete_security_assessment(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7479,7 +7478,7 @@ def delete_security_assessment(self, security_assessment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7566,7 +7565,7 @@ def delete_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sensitive_column got unknown kwargs: {extra_kwargs!r}") @@ -7576,10 +7575,10 @@ def delete_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "sensitiveColumnKey": sensitive_column_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7588,7 +7587,7 @@ def delete_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7672,7 +7671,7 @@ def delete_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -7681,10 +7680,10 @@ def delete_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7693,7 +7692,7 @@ def delete_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7777,7 +7776,7 @@ def delete_sensitive_type(self, sensitive_type_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sensitive_type got unknown kwargs: {extra_kwargs!r}") @@ -7786,10 +7785,10 @@ def delete_sensitive_type(self, sensitive_type_id, **kwargs): "sensitiveTypeId": sensitive_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7798,7 +7797,7 @@ def delete_sensitive_type(self, sensitive_type_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7882,7 +7881,7 @@ def delete_sql_collection(self, sql_collection_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -7891,10 +7890,10 @@ def delete_sql_collection(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7903,7 +7902,7 @@ def delete_sql_collection(self, sql_collection_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7987,7 +7986,7 @@ def delete_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sql_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -7996,10 +7995,10 @@ def delete_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "sqlFirewallPolicyId": sql_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8008,7 +8007,7 @@ def delete_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8092,7 +8091,7 @@ def delete_target_alert_policy_association(self, target_alert_policy_association "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target_alert_policy_association got unknown kwargs: {extra_kwargs!r}") @@ -8101,10 +8100,10 @@ def delete_target_alert_policy_association(self, target_alert_policy_association "targetAlertPolicyAssociationId": target_alert_policy_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8113,7 +8112,7 @@ def delete_target_alert_policy_association(self, target_alert_policy_association "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8197,7 +8196,7 @@ def delete_target_database(self, target_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_target_database got unknown kwargs: {extra_kwargs!r}") @@ -8206,10 +8205,10 @@ def delete_target_database(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8218,7 +8217,7 @@ def delete_target_database(self, target_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8305,7 +8304,7 @@ def delete_user_assessment(self, user_assessment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -8314,10 +8313,10 @@ def delete_user_assessment(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8326,7 +8325,7 @@ def delete_user_assessment(self, user_assessment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8420,7 +8419,7 @@ def discover_audit_trails(self, audit_profile_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"discover_audit_trails got unknown kwargs: {extra_kwargs!r}") @@ -8429,10 +8428,10 @@ def discover_audit_trails(self, audit_profile_id, **kwargs): "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8442,7 +8441,7 @@ def discover_audit_trails(self, audit_profile_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8525,7 +8524,7 @@ def download_discovery_report(self, sensitive_data_model_id, download_discovery_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_discovery_report got unknown kwargs: {extra_kwargs!r}") @@ -8534,10 +8533,10 @@ def download_discovery_report(self, sensitive_data_model_id, download_discovery_ "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8545,7 +8544,7 @@ def download_discovery_report(self, sensitive_data_model_id, download_discovery_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8628,7 +8627,7 @@ def download_masking_log(self, masking_policy_id, download_masking_log_details, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_masking_log got unknown kwargs: {extra_kwargs!r}") @@ -8637,10 +8636,10 @@ def download_masking_log(self, masking_policy_id, download_masking_log_details, "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8648,7 +8647,7 @@ def download_masking_log(self, masking_policy_id, download_masking_log_details, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8734,7 +8733,7 @@ def download_masking_policy(self, masking_policy_id, download_masking_policy_det "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -8743,10 +8742,10 @@ def download_masking_policy(self, masking_policy_id, download_masking_policy_det "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8754,7 +8753,7 @@ def download_masking_policy(self, masking_policy_id, download_masking_policy_det "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8839,7 +8838,7 @@ def download_masking_report(self, masking_policy_id, download_masking_report_det "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_masking_report got unknown kwargs: {extra_kwargs!r}") @@ -8848,10 +8847,10 @@ def download_masking_report(self, masking_policy_id, download_masking_report_det "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8859,7 +8858,7 @@ def download_masking_report(self, masking_policy_id, download_masking_report_det "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8951,7 +8950,7 @@ def download_privilege_script(self, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_privilege_script got unknown kwargs: {extra_kwargs!r}") @@ -8963,7 +8962,7 @@ def download_privilege_script(self, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9059,7 +9058,7 @@ def download_security_assessment_report(self, security_assessment_id, download_s "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_security_assessment_report got unknown kwargs: {extra_kwargs!r}") @@ -9068,10 +9067,10 @@ def download_security_assessment_report(self, security_assessment_id, download_s "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9081,7 +9080,7 @@ def download_security_assessment_report(self, security_assessment_id, download_s "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9168,7 +9167,7 @@ def download_sensitive_data_model(self, sensitive_data_model_id, download_sensit "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -9177,10 +9176,10 @@ def download_sensitive_data_model(self, sensitive_data_model_id, download_sensit "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9188,7 +9187,7 @@ def download_sensitive_data_model(self, sensitive_data_model_id, download_sensit "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9287,7 +9286,7 @@ def download_user_assessment_report(self, user_assessment_id, download_user_asse "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_user_assessment_report got unknown kwargs: {extra_kwargs!r}") @@ -9296,10 +9295,10 @@ def download_user_assessment_report(self, user_assessment_id, download_user_asse "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9309,7 +9308,7 @@ def download_user_assessment_report(self, user_assessment_id, download_user_asse "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9402,7 +9401,7 @@ def enable_data_safe_configuration(self, enable_data_safe_configuration_details, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_data_safe_configuration got unknown kwargs: {extra_kwargs!r}") @@ -9410,7 +9409,7 @@ def enable_data_safe_configuration(self, enable_data_safe_configuration_details, query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9418,7 +9417,7 @@ def enable_data_safe_configuration(self, enable_data_safe_configuration_details, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9502,7 +9501,7 @@ def generate_discovery_report_for_download(self, sensitive_data_model_id, genera "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_discovery_report_for_download got unknown kwargs: {extra_kwargs!r}") @@ -9511,10 +9510,10 @@ def generate_discovery_report_for_download(self, sensitive_data_model_id, genera "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9522,7 +9521,7 @@ def generate_discovery_report_for_download(self, sensitive_data_model_id, genera "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9607,7 +9606,7 @@ def generate_masking_policy_for_download(self, masking_policy_id, generate_maski "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_masking_policy_for_download got unknown kwargs: {extra_kwargs!r}") @@ -9616,10 +9615,10 @@ def generate_masking_policy_for_download(self, masking_policy_id, generate_maski "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9627,7 +9626,7 @@ def generate_masking_policy_for_download(self, masking_policy_id, generate_maski "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9711,7 +9710,7 @@ def generate_masking_report_for_download(self, masking_policy_id, generate_maski "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_masking_report_for_download got unknown kwargs: {extra_kwargs!r}") @@ -9720,10 +9719,10 @@ def generate_masking_report_for_download(self, masking_policy_id, generate_maski "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9731,7 +9730,7 @@ def generate_masking_report_for_download(self, masking_policy_id, generate_maski "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9827,7 +9826,7 @@ def generate_on_prem_connector_configuration(self, generate_on_prem_connector_co "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_on_prem_connector_configuration got unknown kwargs: {extra_kwargs!r}") @@ -9836,10 +9835,10 @@ def generate_on_prem_connector_configuration(self, generate_on_prem_connector_co "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9849,7 +9848,7 @@ def generate_on_prem_connector_configuration(self, generate_on_prem_connector_co "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9960,7 +9959,7 @@ def generate_report(self, report_definition_id, generate_report_details, **kwarg "opc_retry_token", "scim_query" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_report got unknown kwargs: {extra_kwargs!r}") @@ -9969,16 +9968,16 @@ def generate_report(self, report_definition_id, generate_report_details, **kwarg "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "scimQuery": kwargs.get("scim_query", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9987,7 +9986,7 @@ def generate_report(self, report_definition_id, generate_report_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10087,7 +10086,7 @@ def generate_security_assessment_report(self, security_assessment_id, generate_s "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_security_assessment_report got unknown kwargs: {extra_kwargs!r}") @@ -10096,10 +10095,10 @@ def generate_security_assessment_report(self, security_assessment_id, generate_s "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10109,7 +10108,7 @@ def generate_security_assessment_report(self, security_assessment_id, generate_s "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10194,7 +10193,7 @@ def generate_sensitive_data_model_for_download(self, sensitive_data_model_id, ge "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_sensitive_data_model_for_download got unknown kwargs: {extra_kwargs!r}") @@ -10203,10 +10202,10 @@ def generate_sensitive_data_model_for_download(self, sensitive_data_model_id, ge "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10214,7 +10213,7 @@ def generate_sensitive_data_model_for_download(self, sensitive_data_model_id, ge "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10307,7 +10306,7 @@ def generate_sql_firewall_policy(self, sql_collection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_sql_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -10316,10 +10315,10 @@ def generate_sql_firewall_policy(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10329,7 +10328,7 @@ def generate_sql_firewall_policy(self, sql_collection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10425,7 +10424,7 @@ def generate_user_assessment_report(self, user_assessment_id, generate_user_asse "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_user_assessment_report got unknown kwargs: {extra_kwargs!r}") @@ -10434,10 +10433,10 @@ def generate_user_assessment_report(self, user_assessment_id, generate_user_asse "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10447,7 +10446,7 @@ def generate_user_assessment_report(self, user_assessment_id, generate_user_asse "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10526,7 +10525,7 @@ def get_alert(self, alert_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alert got unknown kwargs: {extra_kwargs!r}") @@ -10535,10 +10534,10 @@ def get_alert(self, alert_id, **kwargs): "alertId": alert_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10546,7 +10545,7 @@ def get_alert(self, alert_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10624,7 +10623,7 @@ def get_alert_policy(self, alert_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alert_policy got unknown kwargs: {extra_kwargs!r}") @@ -10633,10 +10632,10 @@ def get_alert_policy(self, alert_policy_id, **kwargs): "alertPolicyId": alert_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10644,7 +10643,7 @@ def get_alert_policy(self, alert_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10730,7 +10729,7 @@ def get_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_audit_archive_retrieval got unknown kwargs: {extra_kwargs!r}") @@ -10739,10 +10738,10 @@ def get_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "auditArchiveRetrievalId": audit_archive_retrieval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10751,7 +10750,7 @@ def get_audit_archive_retrieval(self, audit_archive_retrieval_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10829,7 +10828,7 @@ def get_audit_policy(self, audit_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -10838,10 +10837,10 @@ def get_audit_policy(self, audit_policy_id, **kwargs): "auditPolicyId": audit_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10849,7 +10848,7 @@ def get_audit_policy(self, audit_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10927,7 +10926,7 @@ def get_audit_profile(self, audit_profile_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_audit_profile got unknown kwargs: {extra_kwargs!r}") @@ -10936,10 +10935,10 @@ def get_audit_profile(self, audit_profile_id, **kwargs): "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10947,7 +10946,7 @@ def get_audit_profile(self, audit_profile_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11025,7 +11024,7 @@ def get_audit_trail(self, audit_trail_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -11034,10 +11033,10 @@ def get_audit_trail(self, audit_trail_id, **kwargs): "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11045,7 +11044,7 @@ def get_audit_trail(self, audit_trail_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11138,7 +11137,7 @@ def get_compatible_formats_for_data_types(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compatible_formats_for_data_types got unknown kwargs: {extra_kwargs!r}") @@ -11147,14 +11146,14 @@ def get_compatible_formats_for_data_types(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11261,7 +11260,7 @@ def get_compatible_formats_for_sensitive_types(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compatible_formats_for_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -11280,14 +11279,14 @@ def get_compatible_formats_for_sensitive_types(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11366,7 +11365,7 @@ def get_data_safe_configuration(self, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_safe_configuration got unknown kwargs: {extra_kwargs!r}") @@ -11374,14 +11373,14 @@ def get_data_safe_configuration(self, **kwargs): query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11459,7 +11458,7 @@ def get_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_safe_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -11468,10 +11467,10 @@ def get_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwargs "dataSafePrivateEndpointId": data_safe_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11479,7 +11478,7 @@ def get_data_safe_private_endpoint(self, data_safe_private_endpoint_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11557,7 +11556,7 @@ def get_database_security_config(self, database_security_config_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_security_config got unknown kwargs: {extra_kwargs!r}") @@ -11566,10 +11565,10 @@ def get_database_security_config(self, database_security_config_id, **kwargs): "databaseSecurityConfigId": database_security_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11577,7 +11576,7 @@ def get_database_security_config(self, database_security_config_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11658,7 +11657,7 @@ def get_database_table_access_entry(self, security_policy_report_id, database_ta "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_table_access_entry got unknown kwargs: {extra_kwargs!r}") @@ -11668,10 +11667,10 @@ def get_database_table_access_entry(self, security_policy_report_id, database_ta "databaseTableAccessEntryKey": database_table_access_entry_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11679,7 +11678,7 @@ def get_database_table_access_entry(self, security_policy_report_id, database_ta "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11760,7 +11759,7 @@ def get_database_view_access_entry(self, security_policy_report_id, database_vie "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_view_access_entry got unknown kwargs: {extra_kwargs!r}") @@ -11770,10 +11769,10 @@ def get_database_view_access_entry(self, security_policy_report_id, database_vie "databaseViewAccessEntryKey": database_view_access_entry_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11781,7 +11780,7 @@ def get_database_view_access_entry(self, security_policy_report_id, database_vie "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11862,7 +11861,7 @@ def get_difference_column(self, sdm_masking_policy_difference_id, difference_col "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_difference_column got unknown kwargs: {extra_kwargs!r}") @@ -11872,10 +11871,10 @@ def get_difference_column(self, sdm_masking_policy_difference_id, difference_col "differenceColumnKey": difference_column_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11883,7 +11882,7 @@ def get_difference_column(self, sdm_masking_policy_difference_id, difference_col "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11961,7 +11960,7 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -11970,10 +11969,10 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11981,7 +11980,7 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12062,7 +12061,7 @@ def get_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_discovery_job_result got unknown kwargs: {extra_kwargs!r}") @@ -12072,10 +12071,10 @@ def get_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "resultKey": result_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12083,7 +12082,7 @@ def get_discovery_job_result(self, discovery_job_id, result_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12161,7 +12160,7 @@ def get_library_masking_format(self, library_masking_format_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_library_masking_format got unknown kwargs: {extra_kwargs!r}") @@ -12170,10 +12169,10 @@ def get_library_masking_format(self, library_masking_format_id, **kwargs): "libraryMaskingFormatId": library_masking_format_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12181,7 +12180,7 @@ def get_library_masking_format(self, library_masking_format_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12262,7 +12261,7 @@ def get_masking_column(self, masking_policy_id, masking_column_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_masking_column got unknown kwargs: {extra_kwargs!r}") @@ -12272,10 +12271,10 @@ def get_masking_column(self, masking_policy_id, masking_column_key, **kwargs): "maskingColumnKey": masking_column_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12283,7 +12282,7 @@ def get_masking_column(self, masking_policy_id, masking_column_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12361,7 +12360,7 @@ def get_masking_policy(self, masking_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -12370,10 +12369,10 @@ def get_masking_policy(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12381,7 +12380,7 @@ def get_masking_policy(self, masking_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12459,7 +12458,7 @@ def get_masking_report(self, masking_report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_masking_report got unknown kwargs: {extra_kwargs!r}") @@ -12468,10 +12467,10 @@ def get_masking_report(self, masking_report_id, **kwargs): "maskingReportId": masking_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12479,7 +12478,7 @@ def get_masking_report(self, masking_report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12557,7 +12556,7 @@ def get_on_prem_connector(self, on_prem_connector_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_on_prem_connector got unknown kwargs: {extra_kwargs!r}") @@ -12566,10 +12565,10 @@ def get_on_prem_connector(self, on_prem_connector_id, **kwargs): "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12577,7 +12576,7 @@ def get_on_prem_connector(self, on_prem_connector_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12658,7 +12657,7 @@ def get_peer_target_database(self, target_database_id, peer_target_database_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_peer_target_database got unknown kwargs: {extra_kwargs!r}") @@ -12668,10 +12667,10 @@ def get_peer_target_database(self, target_database_id, peer_target_database_id, "peerTargetDatabaseId": peer_target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12679,7 +12678,7 @@ def get_peer_target_database(self, target_database_id, peer_target_database_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12763,7 +12762,7 @@ def get_profile(self, user_assessment_id, profile_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_profile got unknown kwargs: {extra_kwargs!r}") @@ -12773,10 +12772,10 @@ def get_profile(self, user_assessment_id, profile_name, **kwargs): "profileName": profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12784,7 +12783,7 @@ def get_profile(self, user_assessment_id, profile_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12862,7 +12861,7 @@ def get_report(self, report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_report got unknown kwargs: {extra_kwargs!r}") @@ -12871,10 +12870,10 @@ def get_report(self, report_id, **kwargs): "reportId": report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12882,7 +12881,7 @@ def get_report(self, report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12960,7 +12959,7 @@ def get_report_content(self, report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_report_content got unknown kwargs: {extra_kwargs!r}") @@ -12969,10 +12968,10 @@ def get_report_content(self, report_id, **kwargs): "reportId": report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12980,7 +12979,7 @@ def get_report_content(self, report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13058,7 +13057,7 @@ def get_report_definition(self, report_definition_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_report_definition got unknown kwargs: {extra_kwargs!r}") @@ -13067,10 +13066,10 @@ def get_report_definition(self, report_definition_id, **kwargs): "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13078,7 +13077,7 @@ def get_report_definition(self, report_definition_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13156,7 +13155,7 @@ def get_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sdm_masking_policy_difference got unknown kwargs: {extra_kwargs!r}") @@ -13165,10 +13164,10 @@ def get_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, ** "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13176,7 +13175,7 @@ def get_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13254,7 +13253,7 @@ def get_security_assessment(self, security_assessment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -13263,10 +13262,10 @@ def get_security_assessment(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13274,7 +13273,7 @@ def get_security_assessment(self, security_assessment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13355,7 +13354,7 @@ def get_security_assessment_comparison(self, security_assessment_id, comparison_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_assessment_comparison got unknown kwargs: {extra_kwargs!r}") @@ -13365,10 +13364,10 @@ def get_security_assessment_comparison(self, security_assessment_id, comparison_ "comparisonSecurityAssessmentId": comparison_security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13376,7 +13375,7 @@ def get_security_assessment_comparison(self, security_assessment_id, comparison_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13454,7 +13453,7 @@ def get_security_policy(self, security_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_policy got unknown kwargs: {extra_kwargs!r}") @@ -13463,10 +13462,10 @@ def get_security_policy(self, security_policy_id, **kwargs): "securityPolicyId": security_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13474,7 +13473,7 @@ def get_security_policy(self, security_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13552,7 +13551,7 @@ def get_security_policy_deployment(self, security_policy_deployment_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -13561,10 +13560,10 @@ def get_security_policy_deployment(self, security_policy_deployment_id, **kwargs "securityPolicyDeploymentId": security_policy_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13572,7 +13571,7 @@ def get_security_policy_deployment(self, security_policy_deployment_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13656,7 +13655,7 @@ def get_security_policy_entry_state(self, security_policy_deployment_id, securit "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_policy_entry_state got unknown kwargs: {extra_kwargs!r}") @@ -13666,10 +13665,10 @@ def get_security_policy_entry_state(self, security_policy_deployment_id, securit "securityPolicyEntryStateId": security_policy_entry_state_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13677,7 +13676,7 @@ def get_security_policy_entry_state(self, security_policy_deployment_id, securit "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13755,7 +13754,7 @@ def get_security_policy_report(self, security_policy_report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_policy_report got unknown kwargs: {extra_kwargs!r}") @@ -13764,10 +13763,10 @@ def get_security_policy_report(self, security_policy_report_id, **kwargs): "securityPolicyReportId": security_policy_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13775,7 +13774,7 @@ def get_security_policy_report(self, security_policy_report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13856,7 +13855,7 @@ def get_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sensitive_column got unknown kwargs: {extra_kwargs!r}") @@ -13866,10 +13865,10 @@ def get_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, ** "sensitiveColumnKey": sensitive_column_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13877,7 +13876,7 @@ def get_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13955,7 +13954,7 @@ def get_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -13964,10 +13963,10 @@ def get_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13975,7 +13974,7 @@ def get_sensitive_data_model(self, sensitive_data_model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14053,7 +14052,7 @@ def get_sensitive_type(self, sensitive_type_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sensitive_type got unknown kwargs: {extra_kwargs!r}") @@ -14062,10 +14061,10 @@ def get_sensitive_type(self, sensitive_type_id, **kwargs): "sensitiveTypeId": sensitive_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14073,7 +14072,7 @@ def get_sensitive_type(self, sensitive_type_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14151,7 +14150,7 @@ def get_sql_collection(self, sql_collection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -14160,10 +14159,10 @@ def get_sql_collection(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14171,7 +14170,7 @@ def get_sql_collection(self, sql_collection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14249,7 +14248,7 @@ def get_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -14258,10 +14257,10 @@ def get_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "sqlFirewallPolicyId": sql_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14269,7 +14268,7 @@ def get_sql_firewall_policy(self, sql_firewall_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14347,7 +14346,7 @@ def get_target_alert_policy_association(self, target_alert_policy_association_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_alert_policy_association got unknown kwargs: {extra_kwargs!r}") @@ -14356,10 +14355,10 @@ def get_target_alert_policy_association(self, target_alert_policy_association_id "targetAlertPolicyAssociationId": target_alert_policy_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14367,7 +14366,7 @@ def get_target_alert_policy_association(self, target_alert_policy_association_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14445,7 +14444,7 @@ def get_target_database(self, target_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_target_database got unknown kwargs: {extra_kwargs!r}") @@ -14454,10 +14453,10 @@ def get_target_database(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14465,7 +14464,7 @@ def get_target_database(self, target_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14543,7 +14542,7 @@ def get_user_assessment(self, user_assessment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -14552,10 +14551,10 @@ def get_user_assessment(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14563,7 +14562,7 @@ def get_user_assessment(self, user_assessment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14644,7 +14643,7 @@ def get_user_assessment_comparison(self, user_assessment_id, comparison_user_ass "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_assessment_comparison got unknown kwargs: {extra_kwargs!r}") @@ -14654,10 +14653,10 @@ def get_user_assessment_comparison(self, user_assessment_id, comparison_user_ass "comparisonUserAssessmentId": comparison_user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14665,7 +14664,7 @@ def get_user_assessment_comparison(self, user_assessment_id, comparison_user_ass "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14743,7 +14742,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -14752,10 +14751,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14763,7 +14762,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14952,7 +14951,7 @@ def list_alert_analytics(self, compartment_id, **kwargs): "group_by", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alert_analytics got unknown kwargs: {extra_kwargs!r}") @@ -15009,7 +15008,7 @@ def list_alert_analytics(self, compartment_id, **kwargs): "summaryField": self.base_client.generate_collection_format_param(kwargs.get("summary_field", missing), 'multi'), "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15018,7 +15017,7 @@ def list_alert_analytics(self, compartment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15178,7 +15177,7 @@ def list_alert_policies(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alert_policies got unknown kwargs: {extra_kwargs!r}") @@ -15234,14 +15233,14 @@ def list_alert_policies(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15332,7 +15331,7 @@ def list_alert_policy_rules(self, alert_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alert_policy_rules got unknown kwargs: {extra_kwargs!r}") @@ -15341,24 +15340,24 @@ def list_alert_policy_rules(self, alert_policy_id, **kwargs): "alertPolicyId": alert_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15513,7 +15512,7 @@ def list_alerts(self, compartment_id, **kwargs): "scim_query", "field" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alerts got unknown kwargs: {extra_kwargs!r}") @@ -15559,14 +15558,14 @@ def list_alerts(self, compartment_id, **kwargs): "scimQuery": kwargs.get("scim_query", missing), "field": self.base_client.generate_collection_format_param(kwargs.get("field", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15706,7 +15705,7 @@ def list_audit_archive_retrievals(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_archive_retrievals got unknown kwargs: {extra_kwargs!r}") @@ -15753,14 +15752,14 @@ def list_audit_archive_retrievals(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15947,7 +15946,7 @@ def list_audit_event_analytics(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_event_analytics got unknown kwargs: {extra_kwargs!r}") @@ -16004,7 +16003,7 @@ def list_audit_event_analytics(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16013,7 +16012,7 @@ def list_audit_event_analytics(self, compartment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16155,7 +16154,7 @@ def list_audit_events(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_events got unknown kwargs: {extra_kwargs!r}") @@ -16191,14 +16190,14 @@ def list_audit_events(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/xml", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16348,7 +16347,7 @@ def list_audit_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_policies got unknown kwargs: {extra_kwargs!r}") @@ -16394,14 +16393,14 @@ def list_audit_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16548,7 +16547,7 @@ def list_audit_policy_analytics(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_policy_analytics got unknown kwargs: {extra_kwargs!r}") @@ -16594,14 +16593,14 @@ def list_audit_policy_analytics(self, compartment_id, **kwargs): "targetId": kwargs.get("target_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16723,7 +16722,7 @@ def list_audit_profile_analytics(self, compartment_id, **kwargs): "group_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_profile_analytics got unknown kwargs: {extra_kwargs!r}") @@ -16751,14 +16750,14 @@ def list_audit_profile_analytics(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16923,7 +16922,7 @@ def list_audit_profiles(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_profiles got unknown kwargs: {extra_kwargs!r}") @@ -16972,14 +16971,14 @@ def list_audit_profiles(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17105,7 +17104,7 @@ def list_audit_trail_analytics(self, compartment_id, **kwargs): "target_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_trail_analytics got unknown kwargs: {extra_kwargs!r}") @@ -17134,14 +17133,14 @@ def list_audit_trail_analytics(self, compartment_id, **kwargs): "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi'), "targetId": kwargs.get("target_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17296,7 +17295,7 @@ def list_audit_trails(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_audit_trails got unknown kwargs: {extra_kwargs!r}") @@ -17350,14 +17349,14 @@ def list_audit_trails(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17488,7 +17487,7 @@ def list_available_audit_volumes(self, audit_profile_id, work_request_id, **kwar "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_audit_volumes got unknown kwargs: {extra_kwargs!r}") @@ -17497,10 +17496,10 @@ def list_available_audit_volumes(self, audit_profile_id, work_request_id, **kwar "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17527,14 +17526,14 @@ def list_available_audit_volumes(self, audit_profile_id, work_request_id, **kwar "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17663,7 +17662,7 @@ def list_collected_audit_volumes(self, audit_profile_id, work_request_id, **kwar "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_collected_audit_volumes got unknown kwargs: {extra_kwargs!r}") @@ -17672,10 +17671,10 @@ def list_collected_audit_volumes(self, audit_profile_id, work_request_id, **kwar "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17701,14 +17700,14 @@ def list_collected_audit_volumes(self, audit_profile_id, work_request_id, **kwar "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17840,7 +17839,7 @@ def list_columns(self, target_database_id, **kwargs): "table_name_contains", "column_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_columns got unknown kwargs: {extra_kwargs!r}") @@ -17849,10 +17848,10 @@ def list_columns(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17882,14 +17881,14 @@ def list_columns(self, target_database_id, **kwargs): "tableNameContains": kwargs.get("table_name_contains", missing), "columnNameContains": kwargs.get("column_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18023,7 +18022,7 @@ def list_data_safe_private_endpoints(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_safe_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -18068,14 +18067,14 @@ def list_data_safe_private_endpoints(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18243,7 +18242,7 @@ def list_database_security_configs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_security_configs got unknown kwargs: {extra_kwargs!r}") @@ -18291,14 +18290,14 @@ def list_database_security_configs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18414,7 +18413,7 @@ def list_database_table_access_entries(self, security_policy_report_id, **kwargs "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_table_access_entries got unknown kwargs: {extra_kwargs!r}") @@ -18423,10 +18422,10 @@ def list_database_table_access_entries(self, security_policy_report_id, **kwargs "securityPolicyReportId": security_policy_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18450,14 +18449,14 @@ def list_database_table_access_entries(self, security_policy_report_id, **kwargs "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18579,7 +18578,7 @@ def list_database_view_access_entries(self, security_policy_report_id, **kwargs) "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_view_access_entries got unknown kwargs: {extra_kwargs!r}") @@ -18588,10 +18587,10 @@ def list_database_view_access_entries(self, security_policy_report_id, **kwargs) "securityPolicyReportId": security_policy_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18616,14 +18615,14 @@ def list_database_view_access_entries(self, security_policy_report_id, **kwargs) "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18758,7 +18757,7 @@ def list_difference_columns(self, sdm_masking_policy_difference_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_difference_columns got unknown kwargs: {extra_kwargs!r}") @@ -18767,10 +18766,10 @@ def list_difference_columns(self, sdm_masking_policy_difference_id, **kwargs): "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'difference_type' in kwargs: @@ -18820,14 +18819,14 @@ def list_difference_columns(self, sdm_masking_policy_difference_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18949,7 +18948,7 @@ def list_discovery_analytics(self, compartment_id, **kwargs): "opc_request_id", "is_common" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_analytics got unknown kwargs: {extra_kwargs!r}") @@ -18972,14 +18971,14 @@ def list_discovery_analytics(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "isCommon": kwargs.get("is_common", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19110,7 +19109,7 @@ def list_discovery_job_results(self, discovery_job_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_job_results got unknown kwargs: {extra_kwargs!r}") @@ -19119,10 +19118,10 @@ def list_discovery_job_results(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'discovery_type' in kwargs: @@ -19165,14 +19164,14 @@ def list_discovery_job_results(self, discovery_job_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19313,7 +19312,7 @@ def list_discovery_jobs(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_jobs got unknown kwargs: {extra_kwargs!r}") @@ -19360,14 +19359,14 @@ def list_discovery_jobs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19506,7 +19505,7 @@ def list_finding_analytics(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_finding_analytics got unknown kwargs: {extra_kwargs!r}") @@ -19551,14 +19550,14 @@ def list_finding_analytics(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19689,7 +19688,7 @@ def list_findings(self, security_assessment_id, **kwargs): "access_level", "finding_key" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_findings got unknown kwargs: {extra_kwargs!r}") @@ -19698,10 +19697,10 @@ def list_findings(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'severity' in kwargs: @@ -19743,14 +19742,14 @@ def list_findings(self, security_assessment_id, **kwargs): "accessLevel": kwargs.get("access_level", missing), "findingKey": kwargs.get("finding_key", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19914,7 +19913,7 @@ def list_findings_change_audit_logs(self, security_assessment_id, **kwargs): "time_updated_less_than", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_findings_change_audit_logs got unknown kwargs: {extra_kwargs!r}") @@ -19923,10 +19922,10 @@ def list_findings_change_audit_logs(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'severity' in kwargs: @@ -19965,14 +19964,14 @@ def list_findings_change_audit_logs(self, security_assessment_id, **kwargs): "timeUpdatedGreaterThanOrEqualTo": kwargs.get("time_updated_greater_than_or_equal_to", missing), "timeUpdatedLessThan": kwargs.get("time_updated_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20110,7 +20109,7 @@ def list_grants(self, user_assessment_id, user_key, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_grants got unknown kwargs: {extra_kwargs!r}") @@ -20120,10 +20119,10 @@ def list_grants(self, user_assessment_id, user_key, **kwargs): "userKey": user_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -20153,14 +20152,14 @@ def list_grants(self, user_assessment_id, user_key, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20318,7 +20317,7 @@ def list_library_masking_formats(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_library_masking_formats got unknown kwargs: {extra_kwargs!r}") @@ -20373,14 +20372,14 @@ def list_library_masking_formats(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20508,7 +20507,7 @@ def list_masked_columns(self, masking_report_id, **kwargs): "sensitive_type_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masked_columns got unknown kwargs: {extra_kwargs!r}") @@ -20517,10 +20516,10 @@ def list_masked_columns(self, masking_report_id, **kwargs): "maskingReportId": masking_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -20557,14 +20556,14 @@ def list_masked_columns(self, masking_report_id, **kwargs): "maskingColumnGroup": self.base_client.generate_collection_format_param(kwargs.get("masking_column_group", missing), 'multi'), "sensitiveTypeId": kwargs.get("sensitive_type_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20677,7 +20676,7 @@ def list_masking_analytics(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_analytics got unknown kwargs: {extra_kwargs!r}") @@ -20698,14 +20697,14 @@ def list_masking_analytics(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20893,7 +20892,7 @@ def list_masking_columns(self, masking_policy_id, **kwargs): "time_updated_less_than", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_columns got unknown kwargs: {extra_kwargs!r}") @@ -20902,10 +20901,10 @@ def list_masking_columns(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -20965,14 +20964,14 @@ def list_masking_columns(self, masking_policy_id, **kwargs): "timeUpdatedGreaterThanOrEqualTo": kwargs.get("time_updated_greater_than_or_equal_to", missing), "timeUpdatedLessThan": kwargs.get("time_updated_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21091,7 +21090,7 @@ def list_masking_objects(self, masking_policy_id, **kwargs): "object_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_objects got unknown kwargs: {extra_kwargs!r}") @@ -21100,10 +21099,10 @@ def list_masking_objects(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -21137,14 +21136,14 @@ def list_masking_objects(self, masking_policy_id, **kwargs): "objectName": self.base_client.generate_collection_format_param(kwargs.get("object_name", missing), 'multi'), "objectType": self.base_client.generate_collection_format_param(kwargs.get("object_type", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21304,7 +21303,7 @@ def list_masking_policies(self, compartment_id, **kwargs): "access_level", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_policies got unknown kwargs: {extra_kwargs!r}") @@ -21353,14 +21352,14 @@ def list_masking_policies(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21484,7 +21483,7 @@ def list_masking_reports(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_reports got unknown kwargs: {extra_kwargs!r}") @@ -21521,14 +21520,14 @@ def list_masking_reports(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21635,7 +21634,7 @@ def list_masking_schemas(self, masking_policy_id, **kwargs): "schema_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_masking_schemas got unknown kwargs: {extra_kwargs!r}") @@ -21644,10 +21643,10 @@ def list_masking_schemas(self, masking_policy_id, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -21671,14 +21670,14 @@ def list_masking_schemas(self, masking_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "schemaName": self.base_client.generate_collection_format_param(kwargs.get("schema_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21812,7 +21811,7 @@ def list_on_prem_connectors(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_on_prem_connectors got unknown kwargs: {extra_kwargs!r}") @@ -21857,14 +21856,14 @@ def list_on_prem_connectors(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21969,7 +21968,7 @@ def list_peer_target_databases(self, target_database_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_peer_target_databases got unknown kwargs: {extra_kwargs!r}") @@ -21978,17 +21977,17 @@ def list_peer_target_databases(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21997,7 +21996,7 @@ def list_peer_target_databases(self, target_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22143,7 +22142,7 @@ def list_profile_analytics(self, user_assessment_id, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_profile_analytics got unknown kwargs: {extra_kwargs!r}") @@ -22152,10 +22151,10 @@ def list_profile_analytics(self, user_assessment_id, compartment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'access_level' in kwargs: @@ -22190,14 +22189,14 @@ def list_profile_analytics(self, user_assessment_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22396,7 +22395,7 @@ def list_profile_summaries(self, user_assessment_id, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_profile_summaries got unknown kwargs: {extra_kwargs!r}") @@ -22405,10 +22404,10 @@ def list_profile_summaries(self, user_assessment_id, compartment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'access_level' in kwargs: @@ -22455,14 +22454,14 @@ def list_profile_summaries(self, user_assessment_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22610,7 +22609,7 @@ def list_report_definitions(self, compartment_id, **kwargs): "lifecycle_state", "category" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_report_definitions got unknown kwargs: {extra_kwargs!r}") @@ -22671,14 +22670,14 @@ def list_report_definitions(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "category": kwargs.get("category", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22814,7 +22813,7 @@ def list_reports(self, compartment_id, **kwargs): "lifecycle_state", "type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_reports got unknown kwargs: {extra_kwargs!r}") @@ -22867,14 +22866,14 @@ def list_reports(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "type": kwargs.get("type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22972,7 +22971,7 @@ def list_role_grant_paths(self, security_policy_report_id, grantee, granted_role "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_role_grant_paths got unknown kwargs: {extra_kwargs!r}") @@ -22981,10 +22980,10 @@ def list_role_grant_paths(self, security_policy_report_id, grantee, granted_role "securityPolicyReportId": security_policy_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -22993,14 +22992,14 @@ def list_role_grant_paths(self, security_policy_report_id, grantee, granted_role "grantee": grantee, "grantedRole": granted_role } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23120,7 +23119,7 @@ def list_roles(self, target_database_id, **kwargs): "sort_by", "role_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_roles got unknown kwargs: {extra_kwargs!r}") @@ -23129,10 +23128,10 @@ def list_roles(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -23159,14 +23158,14 @@ def list_roles(self, target_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "roleNameContains": kwargs.get("role_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23282,7 +23281,7 @@ def list_schemas(self, target_database_id, **kwargs): "is_oracle_maintained", "schema_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_schemas got unknown kwargs: {extra_kwargs!r}") @@ -23291,10 +23290,10 @@ def list_schemas(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -23320,14 +23319,14 @@ def list_schemas(self, target_database_id, **kwargs): "isOracleMaintained": kwargs.get("is_oracle_maintained", missing), "schemaNameContains": kwargs.get("schema_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23464,7 +23463,7 @@ def list_sdm_masking_policy_differences(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sdm_masking_policy_differences got unknown kwargs: {extra_kwargs!r}") @@ -23510,14 +23509,14 @@ def list_sdm_masking_policy_differences(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23704,7 +23703,7 @@ def list_security_assessments(self, compartment_id, **kwargs): "page", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_assessments got unknown kwargs: {extra_kwargs!r}") @@ -23770,14 +23769,14 @@ def list_security_assessments(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23880,7 +23879,7 @@ def list_security_feature_analytics(self, compartment_id, **kwargs): "target_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_feature_analytics got unknown kwargs: {extra_kwargs!r}") @@ -23898,14 +23897,14 @@ def list_security_feature_analytics(self, compartment_id, **kwargs): "accessLevel": kwargs.get("access_level", missing), "targetId": kwargs.get("target_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24079,7 +24078,7 @@ def list_security_features(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_features got unknown kwargs: {extra_kwargs!r}") @@ -24187,14 +24186,14 @@ def list_security_features(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24339,7 +24338,7 @@ def list_security_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_policies got unknown kwargs: {extra_kwargs!r}") @@ -24384,14 +24383,14 @@ def list_security_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24544,7 +24543,7 @@ def list_security_policy_deployments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_policy_deployments got unknown kwargs: {extra_kwargs!r}") @@ -24591,14 +24590,14 @@ def list_security_policy_deployments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24700,7 +24699,7 @@ def list_security_policy_entry_states(self, security_policy_deployment_id, **kwa "security_policy_entry_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_policy_entry_states got unknown kwargs: {extra_kwargs!r}") @@ -24709,10 +24708,10 @@ def list_security_policy_entry_states(self, security_policy_deployment_id, **kwa "securityPolicyDeploymentId": security_policy_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'deployment_status' in kwargs: @@ -24728,14 +24727,14 @@ def list_security_policy_entry_states(self, security_policy_deployment_id, **kwa "deploymentStatus": kwargs.get("deployment_status", missing), "securityPolicyEntryId": kwargs.get("security_policy_entry_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24886,7 +24885,7 @@ def list_security_policy_reports(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_policy_reports got unknown kwargs: {extra_kwargs!r}") @@ -24932,14 +24931,14 @@ def list_security_policy_reports(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25138,7 +25137,7 @@ def list_sensitive_columns(self, sensitive_data_model_id, **kwargs): "opc_request_id", "is_case_in_sensitive" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sensitive_columns got unknown kwargs: {extra_kwargs!r}") @@ -25147,10 +25146,10 @@ def list_sensitive_columns(self, sensitive_data_model_id, **kwargs): "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sensitive_column_lifecycle_state' in kwargs: @@ -25220,14 +25219,14 @@ def list_sensitive_columns(self, sensitive_data_model_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "isCaseInSensitive": kwargs.get("is_case_in_sensitive", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25383,7 +25382,7 @@ def list_sensitive_data_models(self, compartment_id, **kwargs): "page", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sensitive_data_models got unknown kwargs: {extra_kwargs!r}") @@ -25431,14 +25430,14 @@ def list_sensitive_data_models(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25555,7 +25554,7 @@ def list_sensitive_objects(self, sensitive_data_model_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sensitive_objects got unknown kwargs: {extra_kwargs!r}") @@ -25564,10 +25563,10 @@ def list_sensitive_objects(self, sensitive_data_model_id, **kwargs): "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'object_type' in kwargs: @@ -25601,14 +25600,14 @@ def list_sensitive_objects(self, sensitive_data_model_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25717,7 +25716,7 @@ def list_sensitive_schemas(self, sensitive_data_model_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sensitive_schemas got unknown kwargs: {extra_kwargs!r}") @@ -25726,10 +25725,10 @@ def list_sensitive_schemas(self, sensitive_data_model_id, **kwargs): "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -25753,14 +25752,14 @@ def list_sensitive_schemas(self, sensitive_data_model_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25937,7 +25936,7 @@ def list_sensitive_types(self, compartment_id, **kwargs): "lifecycle_state", "is_common" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -26003,14 +26002,14 @@ def list_sensitive_types(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "isCommon": kwargs.get("is_common", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26157,7 +26156,7 @@ def list_sql_collection_analytics(self, compartment_id, **kwargs): "time_started", "time_ended" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_collection_analytics got unknown kwargs: {extra_kwargs!r}") @@ -26196,14 +26195,14 @@ def list_sql_collection_analytics(self, compartment_id, **kwargs): "timeStarted": kwargs.get("time_started", missing), "timeEnded": kwargs.get("time_ended", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26311,7 +26310,7 @@ def list_sql_collection_log_insights(self, time_started, time_ended, sql_collect "opc_request_id", "group_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_collection_log_insights got unknown kwargs: {extra_kwargs!r}") @@ -26320,10 +26319,10 @@ def list_sql_collection_log_insights(self, time_started, time_ended, sql_collect "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'group_by' in kwargs: @@ -26340,14 +26339,14 @@ def list_sql_collection_log_insights(self, time_started, time_ended, sql_collect "timeEnded": time_ended, "groupBy": kwargs.get("group_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26520,7 +26519,7 @@ def list_sql_collections(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_collections got unknown kwargs: {extra_kwargs!r}") @@ -26569,14 +26568,14 @@ def list_sql_collections(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26711,7 +26710,7 @@ def list_sql_firewall_allowed_sql_analytics(self, compartment_id, **kwargs): "group_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_allowed_sql_analytics got unknown kwargs: {extra_kwargs!r}") @@ -26740,14 +26739,14 @@ def list_sql_firewall_allowed_sql_analytics(self, compartment_id, **kwargs): "scimQuery": kwargs.get("scim_query", missing), "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26888,7 +26887,7 @@ def list_sql_firewall_allowed_sqls(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_allowed_sqls got unknown kwargs: {extra_kwargs!r}") @@ -26924,14 +26923,14 @@ def list_sql_firewall_allowed_sqls(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27109,7 +27108,7 @@ def list_sql_firewall_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_policies got unknown kwargs: {extra_kwargs!r}") @@ -27166,14 +27165,14 @@ def list_sql_firewall_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27318,7 +27317,7 @@ def list_sql_firewall_policy_analytics(self, compartment_id, **kwargs): "time_ended", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_policy_analytics got unknown kwargs: {extra_kwargs!r}") @@ -27357,14 +27356,14 @@ def list_sql_firewall_policy_analytics(self, compartment_id, **kwargs): "timeStarted": kwargs.get("time_started", missing), "timeEnded": kwargs.get("time_ended", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27530,7 +27529,7 @@ def list_sql_firewall_violation_analytics(self, compartment_id, **kwargs): "group_by", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_violation_analytics got unknown kwargs: {extra_kwargs!r}") @@ -27587,7 +27586,7 @@ def list_sql_firewall_violation_analytics(self, compartment_id, **kwargs): "summaryField": self.base_client.generate_collection_format_param(kwargs.get("summary_field", missing), 'multi'), "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -27595,7 +27594,7 @@ def list_sql_firewall_violation_analytics(self, compartment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27724,7 +27723,7 @@ def list_sql_firewall_violations(self, compartment_id, **kwargs): "sort_by", "scim_query" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_firewall_violations got unknown kwargs: {extra_kwargs!r}") @@ -27760,14 +27759,14 @@ def list_sql_firewall_violations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "scimQuery": kwargs.get("scim_query", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/xml", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27885,7 +27884,7 @@ def list_tables(self, target_database_id, **kwargs): "table_name_contains", "schema_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tables got unknown kwargs: {extra_kwargs!r}") @@ -27894,10 +27893,10 @@ def list_tables(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -27924,14 +27923,14 @@ def list_tables(self, target_database_id, **kwargs): "tableNameContains": kwargs.get("table_name_contains", missing), "schemaNameContains": kwargs.get("schema_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28086,7 +28085,7 @@ def list_target_alert_policy_associations(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_alert_policy_associations got unknown kwargs: {extra_kwargs!r}") @@ -28134,14 +28133,14 @@ def list_target_alert_policy_associations(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28289,7 +28288,7 @@ def list_target_databases(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_target_databases got unknown kwargs: {extra_kwargs!r}") @@ -28351,14 +28350,14 @@ def list_target_databases(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28460,7 +28459,7 @@ def list_user_access_analytics(self, user_assessment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_access_analytics got unknown kwargs: {extra_kwargs!r}") @@ -28469,10 +28468,10 @@ def list_user_access_analytics(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -28495,14 +28494,14 @@ def list_user_access_analytics(self, user_assessment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28703,7 +28702,7 @@ def list_user_analytics(self, user_assessment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_analytics got unknown kwargs: {extra_kwargs!r}") @@ -28712,10 +28711,10 @@ def list_user_analytics(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'access_level' in kwargs: @@ -28759,14 +28758,14 @@ def list_user_analytics(self, user_assessment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28955,7 +28954,7 @@ def list_user_assessments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_assessments got unknown kwargs: {extra_kwargs!r}") @@ -29021,14 +29020,14 @@ def list_user_assessments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29242,7 +29241,7 @@ def list_users(self, user_assessment_id, **kwargs): "schema_list", "are_all_schemas_accessible" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_users got unknown kwargs: {extra_kwargs!r}") @@ -29251,10 +29250,10 @@ def list_users(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'access_level' in kwargs: @@ -29303,14 +29302,14 @@ def list_users(self, user_assessment_id, **kwargs): "schemaList": self.base_client.generate_collection_format_param(kwargs.get("schema_list", missing), 'multi'), "areAllSchemasAccessible": kwargs.get("are_all_schemas_accessible", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29402,7 +29401,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -29411,24 +29410,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29520,7 +29519,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -29529,24 +29528,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29677,7 +29676,7 @@ def list_work_requests(self, compartment_id, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -29715,14 +29714,14 @@ def list_work_requests(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29803,7 +29802,7 @@ def mask_data(self, masking_policy_id, mask_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"mask_data got unknown kwargs: {extra_kwargs!r}") @@ -29812,10 +29811,10 @@ def mask_data(self, masking_policy_id, mask_data_details, **kwargs): "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29823,7 +29822,7 @@ def mask_data(self, masking_policy_id, mask_data_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29919,7 +29918,7 @@ def modify_global_settings(self, modify_global_settings_details, compartment_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"modify_global_settings got unknown kwargs: {extra_kwargs!r}") @@ -29928,10 +29927,10 @@ def modify_global_settings(self, modify_global_settings_details, compartment_id, "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29941,7 +29940,7 @@ def modify_global_settings(self, modify_global_settings_details, compartment_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30042,7 +30041,7 @@ def patch_alerts(self, patch_alerts_details, **kwargs): "compartment_id_in_subtree", "access_level" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_alerts got unknown kwargs: {extra_kwargs!r}") @@ -30058,7 +30057,7 @@ def patch_alerts(self, patch_alerts_details, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "accessLevel": kwargs.get("access_level", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -30066,7 +30065,7 @@ def patch_alerts(self, patch_alerts_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30156,7 +30155,7 @@ def patch_discovery_job_results(self, discovery_job_id, patch_discovery_job_resu "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_discovery_job_results got unknown kwargs: {extra_kwargs!r}") @@ -30165,10 +30164,10 @@ def patch_discovery_job_results(self, discovery_job_id, patch_discovery_job_resu "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30177,7 +30176,7 @@ def patch_discovery_job_results(self, discovery_job_id, patch_discovery_job_resu "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30268,7 +30267,7 @@ def patch_masking_columns(self, masking_policy_id, patch_masking_columns_details "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_masking_columns got unknown kwargs: {extra_kwargs!r}") @@ -30277,10 +30276,10 @@ def patch_masking_columns(self, masking_policy_id, patch_masking_columns_details "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30289,7 +30288,7 @@ def patch_masking_columns(self, masking_policy_id, patch_masking_columns_details "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30379,7 +30378,7 @@ def patch_sdm_masking_policy_difference_columns(self, sdm_masking_policy_differe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_sdm_masking_policy_difference_columns got unknown kwargs: {extra_kwargs!r}") @@ -30388,10 +30387,10 @@ def patch_sdm_masking_policy_difference_columns(self, sdm_masking_policy_differe "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30400,7 +30399,7 @@ def patch_sdm_masking_policy_difference_columns(self, sdm_masking_policy_differe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30491,7 +30490,7 @@ def patch_sensitive_columns(self, sensitive_data_model_id, patch_sensitive_colum "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_sensitive_columns got unknown kwargs: {extra_kwargs!r}") @@ -30500,10 +30499,10 @@ def patch_sensitive_columns(self, sensitive_data_model_id, patch_sensitive_colum "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30512,7 +30511,7 @@ def patch_sensitive_columns(self, sensitive_data_model_id, patch_sensitive_colum "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30598,7 +30597,7 @@ def patch_target_alert_policy_association(self, patch_target_alert_policy_associ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_target_alert_policy_association got unknown kwargs: {extra_kwargs!r}") @@ -30609,7 +30608,7 @@ def patch_target_alert_policy_association(self, patch_target_alert_policy_associ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30703,7 +30702,7 @@ def provision_audit_policy(self, provision_audit_policy_details, audit_policy_id "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"provision_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -30712,10 +30711,10 @@ def provision_audit_policy(self, provision_audit_policy_details, audit_policy_id "auditPolicyId": audit_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30725,7 +30724,7 @@ def provision_audit_policy(self, provision_audit_policy_details, audit_policy_id "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30819,7 +30818,7 @@ def purge_sql_collection_logs(self, sql_collection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"purge_sql_collection_logs got unknown kwargs: {extra_kwargs!r}") @@ -30828,10 +30827,10 @@ def purge_sql_collection_logs(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30841,7 +30840,7 @@ def purge_sql_collection_logs(self, sql_collection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30933,7 +30932,7 @@ def refresh_database_security_configuration(self, database_security_config_id, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_database_security_configuration got unknown kwargs: {extra_kwargs!r}") @@ -30942,10 +30941,10 @@ def refresh_database_security_configuration(self, database_security_config_id, * "databaseSecurityConfigId": database_security_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30955,7 +30954,7 @@ def refresh_database_security_configuration(self, database_security_config_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31051,7 +31050,7 @@ def refresh_security_assessment(self, security_assessment_id, run_security_asses "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -31060,10 +31059,10 @@ def refresh_security_assessment(self, security_assessment_id, run_security_asses "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31073,7 +31072,7 @@ def refresh_security_assessment(self, security_assessment_id, run_security_asses "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31167,7 +31166,7 @@ def refresh_sql_collection_log_insights(self, sql_collection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_sql_collection_log_insights got unknown kwargs: {extra_kwargs!r}") @@ -31176,10 +31175,10 @@ def refresh_sql_collection_log_insights(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31189,7 +31188,7 @@ def refresh_sql_collection_log_insights(self, sql_collection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31281,7 +31280,7 @@ def refresh_target_database(self, target_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_target_database got unknown kwargs: {extra_kwargs!r}") @@ -31290,10 +31289,10 @@ def refresh_target_database(self, target_database_id, **kwargs): "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31303,7 +31302,7 @@ def refresh_target_database(self, target_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31400,7 +31399,7 @@ def refresh_user_assessment(self, user_assessment_id, run_user_assessment_detail "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -31409,10 +31408,10 @@ def refresh_user_assessment(self, user_assessment_id, run_user_assessment_detail "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31422,7 +31421,7 @@ def refresh_user_assessment(self, user_assessment_id, run_user_assessment_detail "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31516,7 +31515,7 @@ def remove_schedule_report(self, report_definition_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_schedule_report got unknown kwargs: {extra_kwargs!r}") @@ -31525,10 +31524,10 @@ def remove_schedule_report(self, report_definition_id, **kwargs): "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31538,7 +31537,7 @@ def remove_schedule_report(self, report_definition_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31623,7 +31622,7 @@ def resume_audit_trail(self, audit_trail_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -31632,10 +31631,10 @@ def resume_audit_trail(self, audit_trail_id, **kwargs): "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31644,7 +31643,7 @@ def resume_audit_trail(self, audit_trail_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31735,7 +31734,7 @@ def resume_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_work_request got unknown kwargs: {extra_kwargs!r}") @@ -31744,10 +31743,10 @@ def resume_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31757,7 +31756,7 @@ def resume_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31849,7 +31848,7 @@ def retrieve_audit_policies(self, audit_policy_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_audit_policies got unknown kwargs: {extra_kwargs!r}") @@ -31858,10 +31857,10 @@ def retrieve_audit_policies(self, audit_policy_id, **kwargs): "auditPolicyId": audit_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31871,7 +31870,7 @@ def retrieve_audit_policies(self, audit_policy_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31966,7 +31965,7 @@ def schedule_report(self, report_definition_id, schedule_report_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_report got unknown kwargs: {extra_kwargs!r}") @@ -31975,10 +31974,10 @@ def schedule_report(self, report_definition_id, schedule_report_details, **kwarg "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31988,7 +31987,7 @@ def schedule_report(self, report_definition_id, schedule_report_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32086,7 +32085,7 @@ def set_security_assessment_baseline(self, security_assessment_id, **kwargs): "opc_request_id", "base_line_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"set_security_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -32095,10 +32094,10 @@ def set_security_assessment_baseline(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32108,7 +32107,7 @@ def set_security_assessment_baseline(self, security_assessment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32206,7 +32205,7 @@ def set_user_assessment_baseline(self, user_assessment_id, **kwargs): "opc_request_id", "base_line_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"set_user_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -32215,10 +32214,10 @@ def set_user_assessment_baseline(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32228,7 +32227,7 @@ def set_user_assessment_baseline(self, user_assessment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32325,7 +32324,7 @@ def start_audit_trail(self, start_audit_trail_details, audit_trail_id, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -32334,10 +32333,10 @@ def start_audit_trail(self, start_audit_trail_details, audit_trail_id, **kwargs) "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32347,7 +32346,7 @@ def start_audit_trail(self, start_audit_trail_details, audit_trail_id, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32441,7 +32440,7 @@ def start_sql_collection(self, sql_collection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -32450,10 +32449,10 @@ def start_sql_collection(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32463,7 +32462,7 @@ def start_sql_collection(self, sql_collection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32548,7 +32547,7 @@ def stop_audit_trail(self, audit_trail_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -32557,10 +32556,10 @@ def stop_audit_trail(self, audit_trail_id, **kwargs): "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32569,7 +32568,7 @@ def stop_audit_trail(self, audit_trail_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32660,7 +32659,7 @@ def stop_sql_collection(self, sql_collection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -32669,10 +32668,10 @@ def stop_sql_collection(self, sql_collection_id, **kwargs): "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32682,7 +32681,7 @@ def stop_sql_collection(self, sql_collection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32774,7 +32773,7 @@ def suspend_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"suspend_work_request got unknown kwargs: {extra_kwargs!r}") @@ -32783,10 +32782,10 @@ def suspend_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32796,7 +32795,7 @@ def suspend_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32889,7 +32888,7 @@ def unset_security_assessment_baseline(self, security_assessment_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unset_security_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -32898,10 +32897,10 @@ def unset_security_assessment_baseline(self, security_assessment_id, **kwargs): "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32911,7 +32910,7 @@ def unset_security_assessment_baseline(self, security_assessment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33004,7 +33003,7 @@ def unset_user_assessment_baseline(self, user_assessment_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unset_user_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -33013,10 +33012,10 @@ def unset_user_assessment_baseline(self, user_assessment_id, **kwargs): "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33026,7 +33025,7 @@ def unset_user_assessment_baseline(self, user_assessment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33114,7 +33113,7 @@ def update_alert(self, alert_id, update_alert_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_alert got unknown kwargs: {extra_kwargs!r}") @@ -33123,10 +33122,10 @@ def update_alert(self, alert_id, update_alert_details, **kwargs): "alertId": alert_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33135,7 +33134,7 @@ def update_alert(self, alert_id, update_alert_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33226,7 +33225,7 @@ def update_audit_archive_retrieval(self, audit_archive_retrieval_id, update_audi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_audit_archive_retrieval got unknown kwargs: {extra_kwargs!r}") @@ -33235,10 +33234,10 @@ def update_audit_archive_retrieval(self, audit_archive_retrieval_id, update_audi "auditArchiveRetrievalId": audit_archive_retrieval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33247,7 +33246,7 @@ def update_audit_archive_retrieval(self, audit_archive_retrieval_id, update_audi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33336,7 +33335,7 @@ def update_audit_policy(self, audit_policy_id, update_audit_policy_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -33345,10 +33344,10 @@ def update_audit_policy(self, audit_policy_id, update_audit_policy_details, **kw "auditPolicyId": audit_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33357,7 +33356,7 @@ def update_audit_policy(self, audit_policy_id, update_audit_policy_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33446,7 +33445,7 @@ def update_audit_profile(self, audit_profile_id, update_audit_profile_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_audit_profile got unknown kwargs: {extra_kwargs!r}") @@ -33455,10 +33454,10 @@ def update_audit_profile(self, audit_profile_id, update_audit_profile_details, * "auditProfileId": audit_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33467,7 +33466,7 @@ def update_audit_profile(self, audit_profile_id, update_audit_profile_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33556,7 +33555,7 @@ def update_audit_trail(self, audit_trail_id, update_audit_trail_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_audit_trail got unknown kwargs: {extra_kwargs!r}") @@ -33565,10 +33564,10 @@ def update_audit_trail(self, audit_trail_id, update_audit_trail_details, **kwarg "auditTrailId": audit_trail_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33577,7 +33576,7 @@ def update_audit_trail(self, audit_trail_id, update_audit_trail_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33666,7 +33665,7 @@ def update_data_safe_private_endpoint(self, data_safe_private_endpoint_id, updat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_safe_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -33675,10 +33674,10 @@ def update_data_safe_private_endpoint(self, data_safe_private_endpoint_id, updat "dataSafePrivateEndpointId": data_safe_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33687,7 +33686,7 @@ def update_data_safe_private_endpoint(self, data_safe_private_endpoint_id, updat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33776,7 +33775,7 @@ def update_database_security_config(self, database_security_config_id, update_da "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_security_config got unknown kwargs: {extra_kwargs!r}") @@ -33785,10 +33784,10 @@ def update_database_security_config(self, database_security_config_id, update_da "databaseSecurityConfigId": database_security_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33797,7 +33796,7 @@ def update_database_security_config(self, database_security_config_id, update_da "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33896,7 +33895,7 @@ def update_finding(self, security_assessment_id, finding_key, update_finding_det "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_finding got unknown kwargs: {extra_kwargs!r}") @@ -33906,10 +33905,10 @@ def update_finding(self, security_assessment_id, finding_key, update_finding_det "findingKey": finding_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33919,7 +33918,7 @@ def update_finding(self, security_assessment_id, finding_key, update_finding_det "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34009,7 +34008,7 @@ def update_library_masking_format(self, library_masking_format_id, update_librar "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_library_masking_format got unknown kwargs: {extra_kwargs!r}") @@ -34018,10 +34017,10 @@ def update_library_masking_format(self, library_masking_format_id, update_librar "libraryMaskingFormatId": library_masking_format_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34030,7 +34029,7 @@ def update_library_masking_format(self, library_masking_format_id, update_librar "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34123,7 +34122,7 @@ def update_masking_column(self, masking_column_key, masking_policy_id, update_ma "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_masking_column got unknown kwargs: {extra_kwargs!r}") @@ -34133,10 +34132,10 @@ def update_masking_column(self, masking_column_key, masking_policy_id, update_ma "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34145,7 +34144,7 @@ def update_masking_column(self, masking_column_key, masking_policy_id, update_ma "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34234,7 +34233,7 @@ def update_masking_policy(self, masking_policy_id, update_masking_policy_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -34243,10 +34242,10 @@ def update_masking_policy(self, masking_policy_id, update_masking_policy_details "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34255,7 +34254,7 @@ def update_masking_policy(self, masking_policy_id, update_masking_policy_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34344,7 +34343,7 @@ def update_on_prem_connector(self, on_prem_connector_id, update_on_prem_connecto "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_on_prem_connector got unknown kwargs: {extra_kwargs!r}") @@ -34353,10 +34352,10 @@ def update_on_prem_connector(self, on_prem_connector_id, update_on_prem_connecto "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34365,7 +34364,7 @@ def update_on_prem_connector(self, on_prem_connector_id, update_on_prem_connecto "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34461,7 +34460,7 @@ def update_on_prem_connector_wallet(self, update_on_prem_connector_wallet_detail "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_on_prem_connector_wallet got unknown kwargs: {extra_kwargs!r}") @@ -34470,10 +34469,10 @@ def update_on_prem_connector_wallet(self, update_on_prem_connector_wallet_detail "onPremConnectorId": on_prem_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34483,7 +34482,7 @@ def update_on_prem_connector_wallet(self, update_on_prem_connector_wallet_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34583,7 +34582,7 @@ def update_peer_target_database(self, target_database_id, peer_target_database_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_peer_target_database got unknown kwargs: {extra_kwargs!r}") @@ -34593,10 +34592,10 @@ def update_peer_target_database(self, target_database_id, peer_target_database_i "peerTargetDatabaseId": peer_target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34606,7 +34605,7 @@ def update_peer_target_database(self, target_database_id, peer_target_database_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34703,7 +34702,7 @@ def update_report(self, report_id, update_report_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_report got unknown kwargs: {extra_kwargs!r}") @@ -34712,10 +34711,10 @@ def update_report(self, report_id, update_report_details, **kwargs): "reportId": report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34725,7 +34724,7 @@ def update_report(self, report_id, update_report_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34822,7 +34821,7 @@ def update_report_definition(self, report_definition_id, update_report_definitio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_report_definition got unknown kwargs: {extra_kwargs!r}") @@ -34831,10 +34830,10 @@ def update_report_definition(self, report_definition_id, update_report_definitio "reportDefinitionId": report_definition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34844,7 +34843,7 @@ def update_report_definition(self, report_definition_id, update_report_definitio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34934,7 +34933,7 @@ def update_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sdm_masking_policy_difference got unknown kwargs: {extra_kwargs!r}") @@ -34943,10 +34942,10 @@ def update_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "sdmMaskingPolicyDifferenceId": sdm_masking_policy_difference_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34955,7 +34954,7 @@ def update_sdm_masking_policy_difference(self, sdm_masking_policy_difference_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35044,7 +35043,7 @@ def update_security_assessment(self, security_assessment_id, update_security_ass "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_assessment got unknown kwargs: {extra_kwargs!r}") @@ -35053,10 +35052,10 @@ def update_security_assessment(self, security_assessment_id, update_security_ass "securityAssessmentId": security_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35065,7 +35064,7 @@ def update_security_assessment(self, security_assessment_id, update_security_ass "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35154,7 +35153,7 @@ def update_security_policy(self, security_policy_id, update_security_policy_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_policy got unknown kwargs: {extra_kwargs!r}") @@ -35163,10 +35162,10 @@ def update_security_policy(self, security_policy_id, update_security_policy_deta "securityPolicyId": security_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35175,7 +35174,7 @@ def update_security_policy(self, security_policy_id, update_security_policy_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35264,7 +35263,7 @@ def update_security_policy_deployment(self, security_policy_deployment_id, updat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -35273,10 +35272,10 @@ def update_security_policy_deployment(self, security_policy_deployment_id, updat "securityPolicyDeploymentId": security_policy_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35285,7 +35284,7 @@ def update_security_policy_deployment(self, security_policy_deployment_id, updat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35377,7 +35376,7 @@ def update_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sensitive_column got unknown kwargs: {extra_kwargs!r}") @@ -35387,10 +35386,10 @@ def update_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "sensitiveColumnKey": sensitive_column_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35399,7 +35398,7 @@ def update_sensitive_column(self, sensitive_data_model_id, sensitive_column_key, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35489,7 +35488,7 @@ def update_sensitive_data_model(self, sensitive_data_model_id, update_sensitive_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -35498,10 +35497,10 @@ def update_sensitive_data_model(self, sensitive_data_model_id, update_sensitive_ "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35510,7 +35509,7 @@ def update_sensitive_data_model(self, sensitive_data_model_id, update_sensitive_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35599,7 +35598,7 @@ def update_sensitive_type(self, sensitive_type_id, update_sensitive_type_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sensitive_type got unknown kwargs: {extra_kwargs!r}") @@ -35608,10 +35607,10 @@ def update_sensitive_type(self, sensitive_type_id, update_sensitive_type_details "sensitiveTypeId": sensitive_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35620,7 +35619,7 @@ def update_sensitive_type(self, sensitive_type_id, update_sensitive_type_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35709,7 +35708,7 @@ def update_sql_collection(self, sql_collection_id, update_sql_collection_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sql_collection got unknown kwargs: {extra_kwargs!r}") @@ -35718,10 +35717,10 @@ def update_sql_collection(self, sql_collection_id, update_sql_collection_details "sqlCollectionId": sql_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35730,7 +35729,7 @@ def update_sql_collection(self, sql_collection_id, update_sql_collection_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35819,7 +35818,7 @@ def update_sql_firewall_policy(self, sql_firewall_policy_id, update_sql_firewall "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sql_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -35828,10 +35827,10 @@ def update_sql_firewall_policy(self, sql_firewall_policy_id, update_sql_firewall "sqlFirewallPolicyId": sql_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35840,7 +35839,7 @@ def update_sql_firewall_policy(self, sql_firewall_policy_id, update_sql_firewall "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35929,7 +35928,7 @@ def update_target_alert_policy_association(self, target_alert_policy_association "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_alert_policy_association got unknown kwargs: {extra_kwargs!r}") @@ -35938,10 +35937,10 @@ def update_target_alert_policy_association(self, target_alert_policy_association "targetAlertPolicyAssociationId": target_alert_policy_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35950,7 +35949,7 @@ def update_target_alert_policy_association(self, target_alert_policy_association "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36046,7 +36045,7 @@ def update_target_database(self, target_database_id, update_target_database_deta "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_target_database got unknown kwargs: {extra_kwargs!r}") @@ -36055,10 +36054,10 @@ def update_target_database(self, target_database_id, update_target_database_deta "targetDatabaseId": target_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36068,7 +36067,7 @@ def update_target_database(self, target_database_id, update_target_database_deta "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36158,7 +36157,7 @@ def update_user_assessment(self, user_assessment_id, update_user_assessment_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_user_assessment got unknown kwargs: {extra_kwargs!r}") @@ -36167,10 +36166,10 @@ def update_user_assessment(self, user_assessment_id, update_user_assessment_deta "userAssessmentId": user_assessment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36179,7 +36178,7 @@ def update_user_assessment(self, user_assessment_id, update_user_assessment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36280,7 +36279,7 @@ def upload_masking_policy(self, upload_masking_policy_details, masking_policy_id "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_masking_policy got unknown kwargs: {extra_kwargs!r}") @@ -36289,10 +36288,10 @@ def upload_masking_policy(self, upload_masking_policy_details, masking_policy_id "maskingPolicyId": masking_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36300,7 +36299,7 @@ def upload_masking_policy(self, upload_masking_policy_details, masking_policy_id "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -36309,7 +36308,7 @@ def upload_masking_policy(self, upload_masking_policy_details, masking_policy_id upload_masking_policy_details = kwargs.get("upload_masking_policy_details", missing) if upload_masking_policy_details is not missing and upload_masking_policy_details is not None: - if (not isinstance(upload_masking_policy_details, (six.binary_type, six.string_types)) and + if (not isinstance(upload_masking_policy_details, (bytes, str)) and not hasattr(upload_masking_policy_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -36421,7 +36420,7 @@ def upload_sensitive_data_model(self, sensitive_data_model_id, upload_sensitive_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_sensitive_data_model got unknown kwargs: {extra_kwargs!r}") @@ -36430,10 +36429,10 @@ def upload_sensitive_data_model(self, sensitive_data_model_id, upload_sensitive_ "sensitiveDataModelId": sensitive_data_model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36441,7 +36440,7 @@ def upload_sensitive_data_model(self, sensitive_data_model_id, upload_sensitive_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -36450,7 +36449,7 @@ def upload_sensitive_data_model(self, sensitive_data_model_id, upload_sensitive_ upload_sensitive_data_model_details = kwargs.get("upload_sensitive_data_model_details", missing) if upload_sensitive_data_model_details is not missing and upload_sensitive_data_model_details is not None: - if (not isinstance(upload_sensitive_data_model_details, (six.binary_type, six.string_types)) and + if (not isinstance(upload_sensitive_data_model_details, (bytes, str)) and not hasattr(upload_sensitive_data_model_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/data_science/data_science_client.py b/src/oci/data_science/data_science_client.py index 99808653eb..d266465cfa 100644 --- a/src/oci/data_science/data_science_client.py +++ b/src/oci/data_science/data_science_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def activate_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_model got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def activate_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def activate_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def activate_model_deployment(self, model_deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -287,10 +286,10 @@ def activate_model_deployment(self, model_deployment_id, **kwargs): "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -299,7 +298,7 @@ def activate_model_deployment(self, model_deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def activate_notebook_session(self, notebook_session_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -392,10 +391,10 @@ def activate_notebook_session(self, notebook_session_id, **kwargs): "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -404,7 +403,7 @@ def activate_notebook_session(self, notebook_session_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -488,7 +487,7 @@ def cancel_job_run(self, job_run_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_job_run got unknown kwargs: {extra_kwargs!r}") @@ -497,10 +496,10 @@ def cancel_job_run(self, job_run_id, **kwargs): "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -509,7 +508,7 @@ def cancel_job_run(self, job_run_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -599,7 +598,7 @@ def cancel_pipeline_run(self, pipeline_run_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -608,10 +607,10 @@ def cancel_pipeline_run(self, pipeline_run_id, **kwargs): "pipelineRunId": pipeline_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -621,7 +620,7 @@ def cancel_pipeline_run(self, pipeline_run_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -708,7 +707,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -717,10 +716,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -729,7 +728,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -818,7 +817,7 @@ def change_data_science_private_endpoint_compartment(self, data_science_private_ "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_data_science_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -827,10 +826,10 @@ def change_data_science_private_endpoint_compartment(self, data_science_private_ "dataSciencePrivateEndpointId": data_science_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -840,7 +839,7 @@ def change_data_science_private_endpoint_compartment(self, data_science_private_ "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -932,7 +931,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -941,10 +940,10 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -953,7 +952,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1042,7 +1041,7 @@ def change_job_run_compartment(self, job_run_id, change_job_run_compartment_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_job_run_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1051,10 +1050,10 @@ def change_job_run_compartment(self, job_run_id, change_job_run_compartment_deta "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1063,7 +1062,7 @@ def change_job_run_compartment(self, job_run_id, change_job_run_compartment_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1156,7 +1155,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1165,10 +1164,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1178,7 +1177,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1272,7 +1271,7 @@ def change_model_deployment_compartment(self, model_deployment_id, change_model_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1281,10 +1280,10 @@ def change_model_deployment_compartment(self, model_deployment_id, change_model_ "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1294,7 +1293,7 @@ def change_model_deployment_compartment(self, model_deployment_id, change_model_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1388,7 +1387,7 @@ def change_model_version_set_compartment(self, model_version_set_id, change_mode "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_version_set_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1397,10 +1396,10 @@ def change_model_version_set_compartment(self, model_version_set_id, change_mode "modelVersionSetId": model_version_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1410,7 +1409,7 @@ def change_model_version_set_compartment(self, model_version_set_id, change_mode "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1504,7 +1503,7 @@ def change_notebook_session_compartment(self, notebook_session_id, change_notebo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_notebook_session_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1513,10 +1512,10 @@ def change_notebook_session_compartment(self, notebook_session_id, change_notebo "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1526,7 +1525,7 @@ def change_notebook_session_compartment(self, notebook_session_id, change_notebo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1616,7 +1615,7 @@ def change_pipeline_compartment(self, pipeline_id, change_pipeline_compartment_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_pipeline_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1625,10 +1624,10 @@ def change_pipeline_compartment(self, pipeline_id, change_pipeline_compartment_d "pipelineId": pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1637,7 +1636,7 @@ def change_pipeline_compartment(self, pipeline_id, change_pipeline_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1726,7 +1725,7 @@ def change_pipeline_run_compartment(self, pipeline_run_id, change_pipeline_run_c "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_pipeline_run_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1735,10 +1734,10 @@ def change_pipeline_run_compartment(self, pipeline_run_id, change_pipeline_run_c "pipelineRunId": pipeline_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1747,7 +1746,7 @@ def change_pipeline_run_compartment(self, pipeline_run_id, change_pipeline_run_c "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1840,7 +1839,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1849,10 +1848,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1862,7 +1861,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1943,7 +1942,7 @@ def create_data_science_private_endpoint(self, create_data_science_private_endpo "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_science_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1954,7 +1953,7 @@ def create_data_science_private_endpoint(self, create_data_science_private_endpo "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2037,7 +2036,7 @@ def create_job(self, create_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job got unknown kwargs: {extra_kwargs!r}") @@ -2048,7 +2047,7 @@ def create_job(self, create_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2153,7 +2152,7 @@ def create_job_artifact(self, job_id, job_artifact, **kwargs): "opc_retry_token", "content_disposition" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job_artifact got unknown kwargs: {extra_kwargs!r}") @@ -2162,10 +2161,10 @@ def create_job_artifact(self, job_id, job_artifact, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2175,7 +2174,7 @@ def create_job_artifact(self, job_id, job_artifact, **kwargs): "content-length": kwargs.get("content_length", missing), "content-disposition": kwargs.get("content_disposition", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -2184,7 +2183,7 @@ def create_job_artifact(self, job_id, job_artifact, **kwargs): job_artifact = kwargs.get("job_artifact", missing) if job_artifact is not missing and job_artifact is not None: - if (not isinstance(job_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(job_artifact, (bytes, str)) and not hasattr(job_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2279,7 +2278,7 @@ def create_job_run(self, create_job_run_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job_run got unknown kwargs: {extra_kwargs!r}") @@ -2290,7 +2289,7 @@ def create_job_run(self, create_job_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2373,7 +2372,7 @@ def create_model(self, create_model_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -2384,7 +2383,7 @@ def create_model(self, create_model_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2502,7 +2501,7 @@ def create_model_artifact(self, model_id, model_artifact, **kwargs): "content_disposition", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model_artifact got unknown kwargs: {extra_kwargs!r}") @@ -2511,10 +2510,10 @@ def create_model_artifact(self, model_id, model_artifact, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2525,7 +2524,7 @@ def create_model_artifact(self, model_id, model_artifact, **kwargs): "content-disposition": kwargs.get("content_disposition", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -2534,7 +2533,7 @@ def create_model_artifact(self, model_id, model_artifact, **kwargs): model_artifact = kwargs.get("model_artifact", missing) if model_artifact is not missing and model_artifact is not None: - if (not isinstance(model_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_artifact, (bytes, str)) and not hasattr(model_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2631,7 +2630,7 @@ def create_model_deployment(self, create_model_deployment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -2642,7 +2641,7 @@ def create_model_deployment(self, create_model_deployment_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2730,7 +2729,7 @@ def create_model_provenance(self, model_id, create_model_provenance_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model_provenance got unknown kwargs: {extra_kwargs!r}") @@ -2739,10 +2738,10 @@ def create_model_provenance(self, model_id, create_model_provenance_details, **k "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2751,7 +2750,7 @@ def create_model_provenance(self, model_id, create_model_provenance_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2836,7 +2835,7 @@ def create_model_version_set(self, create_model_version_set_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model_version_set got unknown kwargs: {extra_kwargs!r}") @@ -2847,7 +2846,7 @@ def create_model_version_set(self, create_model_version_set_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2930,7 +2929,7 @@ def create_notebook_session(self, create_notebook_session_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -2941,7 +2940,7 @@ def create_notebook_session(self, create_notebook_session_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3024,7 +3023,7 @@ def create_pipeline(self, create_pipeline_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -3035,7 +3034,7 @@ def create_pipeline(self, create_pipeline_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3118,7 +3117,7 @@ def create_pipeline_run(self, create_pipeline_run_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -3129,7 +3128,7 @@ def create_pipeline_run(self, create_pipeline_run_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3212,7 +3211,7 @@ def create_project(self, create_project_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -3223,7 +3222,7 @@ def create_project(self, create_project_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3336,7 +3335,7 @@ def create_step_artifact(self, pipeline_id, step_name, step_artifact, **kwargs): "opc_retry_token", "content_disposition" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_step_artifact got unknown kwargs: {extra_kwargs!r}") @@ -3346,10 +3345,10 @@ def create_step_artifact(self, pipeline_id, step_name, step_artifact, **kwargs): "stepName": step_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3359,7 +3358,7 @@ def create_step_artifact(self, pipeline_id, step_name, step_artifact, **kwargs): "content-length": kwargs.get("content_length", missing), "content-disposition": kwargs.get("content_disposition", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -3368,7 +3367,7 @@ def create_step_artifact(self, pipeline_id, step_name, step_artifact, **kwargs): step_artifact = kwargs.get("step_artifact", missing) if step_artifact is not missing and step_artifact is not None: - if (not isinstance(step_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(step_artifact, (bytes, str)) and not hasattr(step_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -3469,7 +3468,7 @@ def deactivate_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_model got unknown kwargs: {extra_kwargs!r}") @@ -3478,10 +3477,10 @@ def deactivate_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3490,7 +3489,7 @@ def deactivate_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3578,7 +3577,7 @@ def deactivate_model_deployment(self, model_deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -3587,10 +3586,10 @@ def deactivate_model_deployment(self, model_deployment_id, **kwargs): "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3599,7 +3598,7 @@ def deactivate_model_deployment(self, model_deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3683,7 +3682,7 @@ def deactivate_notebook_session(self, notebook_session_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -3692,10 +3691,10 @@ def deactivate_notebook_session(self, notebook_session_id, **kwargs): "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3704,7 +3703,7 @@ def deactivate_notebook_session(self, notebook_session_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3786,7 +3785,7 @@ def delete_data_science_private_endpoint(self, data_science_private_endpoint_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_science_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3795,10 +3794,10 @@ def delete_data_science_private_endpoint(self, data_science_private_endpoint_id, "dataSciencePrivateEndpointId": data_science_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3807,7 +3806,7 @@ def delete_data_science_private_endpoint(self, data_science_private_endpoint_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3895,7 +3894,7 @@ def delete_job(self, job_id, **kwargs): "opc_request_id", "delete_related_job_runs" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job got unknown kwargs: {extra_kwargs!r}") @@ -3904,16 +3903,16 @@ def delete_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "deleteRelatedJobRuns": kwargs.get("delete_related_job_runs", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3921,7 +3920,7 @@ def delete_job(self, job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4009,7 +4008,7 @@ def delete_job_run(self, job_run_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job_run got unknown kwargs: {extra_kwargs!r}") @@ -4018,10 +4017,10 @@ def delete_job_run(self, job_run_id, **kwargs): "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4030,7 +4029,7 @@ def delete_job_run(self, job_run_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4116,7 +4115,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -4125,10 +4124,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4137,7 +4136,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4223,7 +4222,7 @@ def delete_model_deployment(self, model_deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -4232,10 +4231,10 @@ def delete_model_deployment(self, model_deployment_id, **kwargs): "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4244,7 +4243,7 @@ def delete_model_deployment(self, model_deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4335,7 +4334,7 @@ def delete_model_version_set(self, model_version_set_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model_version_set got unknown kwargs: {extra_kwargs!r}") @@ -4344,16 +4343,16 @@ def delete_model_version_set(self, model_version_set_id, **kwargs): "modelVersionSetId": model_version_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isDeleteRelatedModels": kwargs.get("is_delete_related_models", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4361,7 +4360,7 @@ def delete_model_version_set(self, model_version_set_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4449,7 +4448,7 @@ def delete_notebook_session(self, notebook_session_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -4458,10 +4457,10 @@ def delete_notebook_session(self, notebook_session_id, **kwargs): "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4470,7 +4469,7 @@ def delete_notebook_session(self, notebook_session_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4564,7 +4563,7 @@ def delete_pipeline(self, pipeline_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -4573,17 +4572,17 @@ def delete_pipeline(self, pipeline_id, **kwargs): "pipelineId": pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "deleteRelatedPipelineRuns": kwargs.get("delete_related_pipeline_runs", missing), "deleteRelatedJobRuns": kwargs.get("delete_related_job_runs", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4591,7 +4590,7 @@ def delete_pipeline(self, pipeline_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4681,7 +4680,7 @@ def delete_pipeline_run(self, pipeline_run_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -4690,16 +4689,16 @@ def delete_pipeline_run(self, pipeline_run_id, **kwargs): "pipelineRunId": pipeline_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "deleteRelatedJobRuns": kwargs.get("delete_related_job_runs", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4707,7 +4706,7 @@ def delete_pipeline_run(self, pipeline_run_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4793,7 +4792,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -4802,10 +4801,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4814,7 +4813,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4907,7 +4906,7 @@ def export_model_artifact(self, model_id, export_model_artifact_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_model_artifact got unknown kwargs: {extra_kwargs!r}") @@ -4916,10 +4915,10 @@ def export_model_artifact(self, model_id, export_model_artifact_details, **kwarg "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4929,7 +4928,7 @@ def export_model_artifact(self, model_id, export_model_artifact_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5008,7 +5007,7 @@ def get_data_science_private_endpoint(self, data_science_private_endpoint_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_science_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -5017,10 +5016,10 @@ def get_data_science_private_endpoint(self, data_science_private_endpoint_id, ** "dataSciencePrivateEndpointId": data_science_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5028,7 +5027,7 @@ def get_data_science_private_endpoint(self, data_science_private_endpoint_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5108,7 +5107,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -5117,10 +5116,10 @@ def get_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5128,7 +5127,7 @@ def get_job(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5215,7 +5214,7 @@ def get_job_artifact_content(self, job_id, **kwargs): "opc_request_id", "range" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -5224,10 +5223,10 @@ def get_job_artifact_content(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5236,7 +5235,7 @@ def get_job_artifact_content(self, job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "range": kwargs.get("range", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5316,7 +5315,7 @@ def get_job_run(self, job_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_run got unknown kwargs: {extra_kwargs!r}") @@ -5325,10 +5324,10 @@ def get_job_run(self, job_run_id, **kwargs): "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5336,7 +5335,7 @@ def get_job_run(self, job_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5416,7 +5415,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -5425,10 +5424,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5436,7 +5435,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5523,7 +5522,7 @@ def get_model_artifact_content(self, model_id, **kwargs): "opc_request_id", "range" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -5532,10 +5531,10 @@ def get_model_artifact_content(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5544,7 +5543,7 @@ def get_model_artifact_content(self, model_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "range": kwargs.get("range", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5624,7 +5623,7 @@ def get_model_deployment(self, model_deployment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -5633,10 +5632,10 @@ def get_model_deployment(self, model_deployment_id, **kwargs): "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5644,7 +5643,7 @@ def get_model_deployment(self, model_deployment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5724,7 +5723,7 @@ def get_model_provenance(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model_provenance got unknown kwargs: {extra_kwargs!r}") @@ -5733,10 +5732,10 @@ def get_model_provenance(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5744,7 +5743,7 @@ def get_model_provenance(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5824,7 +5823,7 @@ def get_model_version_set(self, model_version_set_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model_version_set got unknown kwargs: {extra_kwargs!r}") @@ -5833,10 +5832,10 @@ def get_model_version_set(self, model_version_set_id, **kwargs): "modelVersionSetId": model_version_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5844,7 +5843,7 @@ def get_model_version_set(self, model_version_set_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5924,7 +5923,7 @@ def get_notebook_session(self, notebook_session_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -5933,10 +5932,10 @@ def get_notebook_session(self, notebook_session_id, **kwargs): "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5944,7 +5943,7 @@ def get_notebook_session(self, notebook_session_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6024,7 +6023,7 @@ def get_pipeline(self, pipeline_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -6033,10 +6032,10 @@ def get_pipeline(self, pipeline_id, **kwargs): "pipelineId": pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6044,7 +6043,7 @@ def get_pipeline(self, pipeline_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6124,7 +6123,7 @@ def get_pipeline_run(self, pipeline_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -6133,10 +6132,10 @@ def get_pipeline_run(self, pipeline_run_id, **kwargs): "pipelineRunId": pipeline_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6144,7 +6143,7 @@ def get_pipeline_run(self, pipeline_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6224,7 +6223,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -6233,10 +6232,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6244,7 +6243,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6334,7 +6333,7 @@ def get_step_artifact_content(self, pipeline_id, step_name, **kwargs): "opc_request_id", "range" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_step_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -6344,10 +6343,10 @@ def get_step_artifact_content(self, pipeline_id, step_name, **kwargs): "stepName": step_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6356,7 +6355,7 @@ def get_step_artifact_content(self, pipeline_id, step_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "range": kwargs.get("range", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6438,7 +6437,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -6447,10 +6446,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6458,7 +6457,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6538,7 +6537,7 @@ def head_job_artifact(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_job_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6547,10 +6546,10 @@ def head_job_artifact(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6558,7 +6557,7 @@ def head_job_artifact(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6636,7 +6635,7 @@ def head_model_artifact(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_model_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6645,10 +6644,10 @@ def head_model_artifact(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6656,7 +6655,7 @@ def head_model_artifact(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6737,7 +6736,7 @@ def head_step_artifact(self, pipeline_id, step_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_step_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6747,10 +6746,10 @@ def head_step_artifact(self, pipeline_id, step_name, **kwargs): "stepName": step_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6758,7 +6757,7 @@ def head_step_artifact(self, pipeline_id, step_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6847,7 +6846,7 @@ def import_model_artifact(self, model_id, import_model_artifact_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_model_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6856,10 +6855,10 @@ def import_model_artifact(self, model_id, import_model_artifact_details, **kwarg "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6868,7 +6867,7 @@ def import_model_artifact(self, model_id, import_model_artifact_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7000,7 +6999,7 @@ def list_data_science_private_endpoints(self, compartment_id, **kwargs): "created_by", "data_science_resource_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_science_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -7044,14 +7043,14 @@ def list_data_science_private_endpoints(self, compartment_id, **kwargs): "createdBy": kwargs.get("created_by", missing), "dataScienceResourceType": kwargs.get("data_science_resource_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7151,7 +7150,7 @@ def list_fast_launch_job_configs(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fast_launch_job_configs got unknown kwargs: {extra_kwargs!r}") @@ -7161,14 +7160,14 @@ def list_fast_launch_job_configs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7312,7 +7311,7 @@ def list_job_runs(self, compartment_id, **kwargs): "sort_by", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_runs got unknown kwargs: {extra_kwargs!r}") @@ -7350,14 +7349,14 @@ def list_job_runs(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7457,7 +7456,7 @@ def list_job_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_shapes got unknown kwargs: {extra_kwargs!r}") @@ -7467,14 +7466,14 @@ def list_job_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7618,7 +7617,7 @@ def list_jobs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -7656,14 +7655,14 @@ def list_jobs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7763,7 +7762,7 @@ def list_model_deployment_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_model_deployment_shapes got unknown kwargs: {extra_kwargs!r}") @@ -7773,14 +7772,14 @@ def list_model_deployment_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7924,7 +7923,7 @@ def list_model_deployments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_model_deployments got unknown kwargs: {extra_kwargs!r}") @@ -7962,14 +7961,14 @@ def list_model_deployments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8111,7 +8110,7 @@ def list_model_version_sets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_model_version_sets got unknown kwargs: {extra_kwargs!r}") @@ -8149,14 +8148,14 @@ def list_model_version_sets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8307,7 +8306,7 @@ def list_models(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -8347,14 +8346,14 @@ def list_models(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8454,7 +8453,7 @@ def list_notebook_session_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_notebook_session_shapes got unknown kwargs: {extra_kwargs!r}") @@ -8464,14 +8463,14 @@ def list_notebook_session_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8615,7 +8614,7 @@ def list_notebook_sessions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_notebook_sessions got unknown kwargs: {extra_kwargs!r}") @@ -8653,14 +8652,14 @@ def list_notebook_sessions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8803,7 +8802,7 @@ def list_pipeline_runs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pipeline_runs got unknown kwargs: {extra_kwargs!r}") @@ -8841,14 +8840,14 @@ def list_pipeline_runs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8991,7 +8990,7 @@ def list_pipelines(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -9029,14 +9028,14 @@ def list_pipelines(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9174,7 +9173,7 @@ def list_projects(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -9211,14 +9210,14 @@ def list_projects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9318,7 +9317,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -9327,24 +9326,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9446,7 +9445,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -9455,24 +9454,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9604,7 +9603,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -9647,14 +9646,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9745,7 +9744,7 @@ def update_data_science_private_endpoint(self, data_science_private_endpoint_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_science_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -9754,10 +9753,10 @@ def update_data_science_private_endpoint(self, data_science_private_endpoint_id, "dataSciencePrivateEndpointId": data_science_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9766,7 +9765,7 @@ def update_data_science_private_endpoint(self, data_science_private_endpoint_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9857,7 +9856,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -9866,10 +9865,10 @@ def update_job(self, job_id, update_job_details, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9878,7 +9877,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9971,7 +9970,7 @@ def update_job_run(self, job_run_id, update_job_run_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job_run got unknown kwargs: {extra_kwargs!r}") @@ -9980,10 +9979,10 @@ def update_job_run(self, job_run_id, update_job_run_details, **kwargs): "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9992,7 +9991,7 @@ def update_job_run(self, job_run_id, update_job_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10085,7 +10084,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -10094,10 +10093,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10106,7 +10105,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10205,7 +10204,7 @@ def update_model_deployment(self, model_deployment_id, update_model_deployment_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -10214,10 +10213,10 @@ def update_model_deployment(self, model_deployment_id, update_model_deployment_d "modelDeploymentId": model_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10226,7 +10225,7 @@ def update_model_deployment(self, model_deployment_id, update_model_deployment_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10317,7 +10316,7 @@ def update_model_provenance(self, model_id, update_model_provenance_details, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model_provenance got unknown kwargs: {extra_kwargs!r}") @@ -10326,10 +10325,10 @@ def update_model_provenance(self, model_id, update_model_provenance_details, **k "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10338,7 +10337,7 @@ def update_model_provenance(self, model_id, update_model_provenance_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10431,7 +10430,7 @@ def update_model_version_set(self, model_version_set_id, update_model_version_se "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model_version_set got unknown kwargs: {extra_kwargs!r}") @@ -10440,10 +10439,10 @@ def update_model_version_set(self, model_version_set_id, update_model_version_se "modelVersionSetId": model_version_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10452,7 +10451,7 @@ def update_model_version_set(self, model_version_set_id, update_model_version_se "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10548,7 +10547,7 @@ def update_notebook_session(self, notebook_session_id, update_notebook_session_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_notebook_session got unknown kwargs: {extra_kwargs!r}") @@ -10557,10 +10556,10 @@ def update_notebook_session(self, notebook_session_id, update_notebook_session_d "notebookSessionId": notebook_session_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10569,7 +10568,7 @@ def update_notebook_session(self, notebook_session_id, update_notebook_session_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10662,7 +10661,7 @@ def update_pipeline(self, pipeline_id, update_pipeline_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -10671,10 +10670,10 @@ def update_pipeline(self, pipeline_id, update_pipeline_details, **kwargs): "pipelineId": pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10683,7 +10682,7 @@ def update_pipeline(self, pipeline_id, update_pipeline_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10774,7 +10773,7 @@ def update_pipeline_run(self, pipeline_run_id, update_pipeline_run_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -10783,10 +10782,10 @@ def update_pipeline_run(self, pipeline_run_id, update_pipeline_run_details, **kw "pipelineRunId": pipeline_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10795,7 +10794,7 @@ def update_pipeline_run(self, pipeline_run_id, update_pipeline_run_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10886,7 +10885,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -10895,10 +10894,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10907,7 +10906,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index 0661124ed9..49a384ec59 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def activate_exadata_infrastructure(self, exadata_infrastructure_id, activate_ex "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def activate_exadata_infrastructure(self, exadata_infrastructure_id, activate_ex "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def activate_exadata_infrastructure(self, exadata_infrastructure_id, activate_ex "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def add_storage_capacity_cloud_exadata_infrastructure(self, cloud_exadata_infras "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_storage_capacity_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -298,10 +297,10 @@ def add_storage_capacity_cloud_exadata_infrastructure(self, cloud_exadata_infras "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -311,7 +310,7 @@ def add_storage_capacity_cloud_exadata_infrastructure(self, cloud_exadata_infras "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -404,7 +403,7 @@ def add_storage_capacity_exadata_infrastructure(self, exadata_infrastructure_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_storage_capacity_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -413,10 +412,10 @@ def add_storage_capacity_exadata_infrastructure(self, exadata_infrastructure_id, "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -426,7 +425,7 @@ def add_storage_capacity_exadata_infrastructure(self, exadata_infrastructure_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -522,7 +521,7 @@ def add_virtual_machine_to_cloud_vm_cluster(self, add_virtual_machine_to_cloud_v "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_virtual_machine_to_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -531,10 +530,10 @@ def add_virtual_machine_to_cloud_vm_cluster(self, add_virtual_machine_to_cloud_v "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -544,7 +543,7 @@ def add_virtual_machine_to_cloud_vm_cluster(self, add_virtual_machine_to_cloud_v "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -642,7 +641,7 @@ def add_virtual_machine_to_vm_cluster(self, add_virtual_machine_to_vm_cluster_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_virtual_machine_to_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -651,10 +650,10 @@ def add_virtual_machine_to_vm_cluster(self, add_virtual_machine_to_vm_cluster_de "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -664,7 +663,7 @@ def add_virtual_machine_to_vm_cluster(self, add_virtual_machine_to_vm_cluster_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def autonomous_database_manual_refresh(self, autonomous_database_id, autonomous_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"autonomous_database_manual_refresh got unknown kwargs: {extra_kwargs!r}") @@ -771,10 +770,10 @@ def autonomous_database_manual_refresh(self, autonomous_database_id, autonomous_ "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -784,7 +783,7 @@ def autonomous_database_manual_refresh(self, autonomous_database_id, autonomous_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -879,7 +878,7 @@ def cancel_backup(self, backup_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_backup got unknown kwargs: {extra_kwargs!r}") @@ -888,10 +887,10 @@ def cancel_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -901,7 +900,7 @@ def cancel_backup(self, backup_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -999,7 +998,7 @@ def change_autonomous_container_database_compartment(self, change_compartment_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_container_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1008,10 +1007,10 @@ def change_autonomous_container_database_compartment(self, change_compartment_de "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1021,7 +1020,7 @@ def change_autonomous_container_database_compartment(self, change_compartment_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1121,7 +1120,7 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1130,10 +1129,10 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1143,7 +1142,7 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1239,7 +1238,7 @@ def change_autonomous_database_software_image_compartment(self, change_autonomou "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_database_software_image_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1248,10 +1247,10 @@ def change_autonomous_database_software_image_compartment(self, change_autonomou "autonomousDatabaseSoftwareImageId": autonomous_database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1261,7 +1260,7 @@ def change_autonomous_database_software_image_compartment(self, change_autonomou "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1361,7 +1360,7 @@ def change_autonomous_exadata_infrastructure_compartment(self, change_compartmen "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_exadata_infrastructure_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1370,10 +1369,10 @@ def change_autonomous_exadata_infrastructure_compartment(self, change_compartmen "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1383,7 +1382,7 @@ def change_autonomous_exadata_infrastructure_compartment(self, change_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1479,7 +1478,7 @@ def change_autonomous_vm_cluster_compartment(self, change_autonomous_vm_cluster_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_vm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1488,10 +1487,10 @@ def change_autonomous_vm_cluster_compartment(self, change_autonomous_vm_cluster_ "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1501,7 +1500,7 @@ def change_autonomous_vm_cluster_compartment(self, change_autonomous_vm_cluster_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1601,7 +1600,7 @@ def change_backup_destination_compartment(self, change_compartment_details, back "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_backup_destination_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1610,10 +1609,10 @@ def change_backup_destination_compartment(self, change_compartment_details, back "backupDestinationId": backup_destination_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1623,7 +1622,7 @@ def change_backup_destination_compartment(self, change_compartment_details, back "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1719,7 +1718,7 @@ def change_cloud_autonomous_vm_cluster_compartment(self, change_cloud_autonomous "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cloud_autonomous_vm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1728,10 +1727,10 @@ def change_cloud_autonomous_vm_cluster_compartment(self, change_cloud_autonomous "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1741,7 +1740,7 @@ def change_cloud_autonomous_vm_cluster_compartment(self, change_cloud_autonomous "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1839,7 +1838,7 @@ def change_cloud_exadata_infrastructure_compartment(self, change_cloud_exadata_i "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cloud_exadata_infrastructure_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1848,10 +1847,10 @@ def change_cloud_exadata_infrastructure_compartment(self, change_cloud_exadata_i "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1861,7 +1860,7 @@ def change_cloud_exadata_infrastructure_compartment(self, change_cloud_exadata_i "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1957,7 +1956,7 @@ def change_cloud_vm_cluster_compartment(self, change_cloud_vm_cluster_compartmen "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_cloud_vm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1966,10 +1965,10 @@ def change_cloud_vm_cluster_compartment(self, change_cloud_vm_cluster_compartmen "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1979,7 +1978,7 @@ def change_cloud_vm_cluster_compartment(self, change_cloud_vm_cluster_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2079,7 +2078,7 @@ def change_database_software_image_compartment(self, change_compartment_details, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_software_image_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2088,10 +2087,10 @@ def change_database_software_image_compartment(self, change_compartment_details, "databaseSoftwareImageId": database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2101,7 +2100,7 @@ def change_database_software_image_compartment(self, change_compartment_details, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2202,7 +2201,7 @@ def change_dataguard_role(self, change_dataguard_role_details, autonomous_contai "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dataguard_role got unknown kwargs: {extra_kwargs!r}") @@ -2211,10 +2210,10 @@ def change_dataguard_role(self, change_dataguard_role_details, autonomous_contai "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2224,7 +2223,7 @@ def change_dataguard_role(self, change_dataguard_role_details, autonomous_contai "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2333,7 +2332,7 @@ def change_db_system_compartment(self, change_compartment_details, db_system_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_db_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2342,10 +2341,10 @@ def change_db_system_compartment(self, change_compartment_details, db_system_id, "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2355,7 +2354,7 @@ def change_db_system_compartment(self, change_compartment_details, db_system_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2443,7 +2442,7 @@ def change_disaster_recovery_configuration(self, autonomous_database_id, change_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_disaster_recovery_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2452,10 +2451,10 @@ def change_disaster_recovery_configuration(self, autonomous_database_id, change_ "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2464,7 +2463,7 @@ def change_disaster_recovery_configuration(self, autonomous_database_id, change_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2562,7 +2561,7 @@ def change_exadata_infrastructure_compartment(self, change_exadata_infrastructur "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_exadata_infrastructure_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2571,10 +2570,10 @@ def change_exadata_infrastructure_compartment(self, change_exadata_infrastructur "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2584,7 +2583,7 @@ def change_exadata_infrastructure_compartment(self, change_exadata_infrastructur "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2685,7 +2684,7 @@ def change_external_container_database_compartment(self, change_compartment_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_external_container_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2694,10 +2693,10 @@ def change_external_container_database_compartment(self, change_compartment_deta "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2707,7 +2706,7 @@ def change_external_container_database_compartment(self, change_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2807,7 +2806,7 @@ def change_external_non_container_database_compartment(self, change_compartment_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_external_non_container_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2816,10 +2815,10 @@ def change_external_non_container_database_compartment(self, change_compartment_ "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2829,7 +2828,7 @@ def change_external_non_container_database_compartment(self, change_compartment_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2932,7 +2931,7 @@ def change_external_pluggable_database_compartment(self, change_compartment_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_external_pluggable_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2941,10 +2940,10 @@ def change_external_pluggable_database_compartment(self, change_compartment_deta "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2954,7 +2953,7 @@ def change_external_pluggable_database_compartment(self, change_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3054,7 +3053,7 @@ def change_key_store_compartment(self, change_key_store_compartment_details, key "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_key_store_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3063,10 +3062,10 @@ def change_key_store_compartment(self, change_key_store_compartment_details, key "keyStoreId": key_store_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3076,7 +3075,7 @@ def change_key_store_compartment(self, change_key_store_compartment_details, key "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3172,7 +3171,7 @@ def change_key_store_type(self, database_id, change_key_store_type_details, **kw "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_key_store_type got unknown kwargs: {extra_kwargs!r}") @@ -3181,10 +3180,10 @@ def change_key_store_type(self, database_id, change_key_store_type_details, **kw "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3194,7 +3193,7 @@ def change_key_store_type(self, database_id, change_key_store_type_details, **kw "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3290,7 +3289,7 @@ def change_oneoff_patch_compartment(self, change_compartment_details, oneoff_pat "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oneoff_patch_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3299,10 +3298,10 @@ def change_oneoff_patch_compartment(self, change_compartment_details, oneoff_pat "oneoffPatchId": oneoff_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3312,7 +3311,7 @@ def change_oneoff_patch_compartment(self, change_compartment_details, oneoff_pat "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3409,7 +3408,7 @@ def change_vm_cluster_compartment(self, change_vm_cluster_compartment_details, v "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3418,10 +3417,10 @@ def change_vm_cluster_compartment(self, change_vm_cluster_compartment_details, v "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3431,7 +3430,7 @@ def change_vm_cluster_compartment(self, change_vm_cluster_compartment_details, v "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3526,7 +3525,7 @@ def check_external_database_connector_connection_status(self, external_database_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"check_external_database_connector_connection_status got unknown kwargs: {extra_kwargs!r}") @@ -3535,10 +3534,10 @@ def check_external_database_connector_connection_status(self, external_database_ "externalDatabaseConnectorId": external_database_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3548,7 +3547,7 @@ def check_external_database_connector_connection_status(self, external_database_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3642,7 +3641,7 @@ def complete_external_backup_job(self, backup_id, complete_external_backup_job_d "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"complete_external_backup_job got unknown kwargs: {extra_kwargs!r}") @@ -3651,10 +3650,10 @@ def complete_external_backup_job(self, backup_id, complete_external_backup_job_d "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3663,7 +3662,7 @@ def complete_external_backup_job(self, backup_id, complete_external_backup_job_d "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3765,7 +3764,7 @@ def configure_autonomous_database_vault_key(self, autonomous_database_id, config "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_autonomous_database_vault_key got unknown kwargs: {extra_kwargs!r}") @@ -3774,10 +3773,10 @@ def configure_autonomous_database_vault_key(self, autonomous_database_id, config "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3787,7 +3786,7 @@ def configure_autonomous_database_vault_key(self, autonomous_database_id, config "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3875,7 +3874,7 @@ def configure_saas_admin_user(self, autonomous_database_id, configure_saas_admin "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_saas_admin_user got unknown kwargs: {extra_kwargs!r}") @@ -3884,10 +3883,10 @@ def configure_saas_admin_user(self, autonomous_database_id, configure_saas_admin "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3896,7 +3895,7 @@ def configure_saas_admin_user(self, autonomous_database_id, configure_saas_admin "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3985,7 +3984,7 @@ def convert_to_pdb(self, database_id, convert_to_pdb_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"convert_to_pdb got unknown kwargs: {extra_kwargs!r}") @@ -3994,10 +3993,10 @@ def convert_to_pdb(self, database_id, convert_to_pdb_details, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4006,7 +4005,7 @@ def convert_to_pdb(self, database_id, convert_to_pdb_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4104,7 +4103,7 @@ def convert_to_regular_pluggable_database(self, convert_to_regular_pluggable_dat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"convert_to_regular_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -4113,10 +4112,10 @@ def convert_to_regular_pluggable_database(self, convert_to_regular_pluggable_dat "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4126,7 +4125,7 @@ def convert_to_regular_pluggable_database(self, convert_to_regular_pluggable_dat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4213,7 +4212,7 @@ def create_application_vip(self, create_application_vip_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application_vip got unknown kwargs: {extra_kwargs!r}") @@ -4224,7 +4223,7 @@ def create_application_vip(self, create_application_vip_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4305,7 +4304,7 @@ def create_autonomous_container_database(self, create_autonomous_container_datab "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -4315,7 +4314,7 @@ def create_autonomous_container_database(self, create_autonomous_container_datab "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4411,7 +4410,7 @@ def create_autonomous_container_database_dataguard_association(self, autonomous_ "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -4420,10 +4419,10 @@ def create_autonomous_container_database_dataguard_association(self, autonomous_ "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4431,7 +4430,7 @@ def create_autonomous_container_database_dataguard_association(self, autonomous_ "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4518,7 +4517,7 @@ def create_autonomous_database(self, create_autonomous_database_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -4529,7 +4528,7 @@ def create_autonomous_database(self, create_autonomous_database_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4614,7 +4613,7 @@ def create_autonomous_database_backup(self, create_autonomous_database_backup_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -4625,7 +4624,7 @@ def create_autonomous_database_backup(self, create_autonomous_database_backup_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4710,7 +4709,7 @@ def create_autonomous_database_software_image(self, create_autonomous_database_s "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -4721,7 +4720,7 @@ def create_autonomous_database_software_image(self, create_autonomous_database_s "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4806,7 +4805,7 @@ def create_autonomous_vm_cluster(self, create_autonomous_vm_cluster_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -4817,7 +4816,7 @@ def create_autonomous_vm_cluster(self, create_autonomous_vm_cluster_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4898,7 +4897,7 @@ def create_backup(self, create_backup_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backup got unknown kwargs: {extra_kwargs!r}") @@ -4908,7 +4907,7 @@ def create_backup(self, create_backup_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4993,7 +4992,7 @@ def create_backup_destination(self, create_backup_destination_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backup_destination got unknown kwargs: {extra_kwargs!r}") @@ -5004,7 +5003,7 @@ def create_backup_destination(self, create_backup_destination_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5089,7 +5088,7 @@ def create_cloud_autonomous_vm_cluster(self, create_cloud_autonomous_vm_cluster_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -5100,7 +5099,7 @@ def create_cloud_autonomous_vm_cluster(self, create_cloud_autonomous_vm_cluster_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5189,7 +5188,7 @@ def create_cloud_exadata_infrastructure(self, create_cloud_exadata_infrastructur "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -5200,7 +5199,7 @@ def create_cloud_exadata_infrastructure(self, create_cloud_exadata_infrastructur "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5287,7 +5286,7 @@ def create_cloud_vm_cluster(self, create_cloud_vm_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -5298,7 +5297,7 @@ def create_cloud_vm_cluster(self, create_cloud_vm_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5386,7 +5385,7 @@ def create_console_connection(self, create_console_connection_details, db_node_i "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -5395,10 +5394,10 @@ def create_console_connection(self, create_console_connection_details, db_node_i "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5406,7 +5405,7 @@ def create_console_connection(self, create_console_connection_details, db_node_i "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5498,7 +5497,7 @@ def create_console_history(self, create_console_history_details, db_node_id, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_console_history got unknown kwargs: {extra_kwargs!r}") @@ -5507,10 +5506,10 @@ def create_console_history(self, create_console_history_details, db_node_id, **k "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5519,7 +5518,7 @@ def create_console_history(self, create_console_history_details, db_node_id, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5617,7 +5616,7 @@ def create_data_guard_association(self, database_id, create_data_guard_associati "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -5626,10 +5625,10 @@ def create_data_guard_association(self, database_id, create_data_guard_associati "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5637,7 +5636,7 @@ def create_data_guard_association(self, database_id, create_data_guard_associati "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5724,7 +5723,7 @@ def create_database(self, create_new_database_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database got unknown kwargs: {extra_kwargs!r}") @@ -5735,7 +5734,7 @@ def create_database(self, create_new_database_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5816,7 +5815,7 @@ def create_database_software_image(self, create_database_software_image_details, "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -5826,7 +5825,7 @@ def create_database_software_image(self, create_database_software_image_details, "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5907,7 +5906,7 @@ def create_db_home(self, create_db_home_with_db_system_id_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_db_home got unknown kwargs: {extra_kwargs!r}") @@ -5917,7 +5916,7 @@ def create_db_home(self, create_db_home_with_db_system_id_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6003,7 +6002,7 @@ def create_exadata_infrastructure(self, create_exadata_infrastructure_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -6014,7 +6013,7 @@ def create_exadata_infrastructure(self, create_exadata_infrastructure_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6099,7 +6098,7 @@ def create_external_backup_job(self, create_external_backup_job_details, **kwarg "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_backup_job got unknown kwargs: {extra_kwargs!r}") @@ -6109,7 +6108,7 @@ def create_external_backup_job(self, create_external_backup_job_details, **kwarg "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6194,7 +6193,7 @@ def create_external_container_database(self, create_external_container_database_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_container_database got unknown kwargs: {extra_kwargs!r}") @@ -6205,7 +6204,7 @@ def create_external_container_database(self, create_external_container_database_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6290,7 +6289,7 @@ def create_external_database_connector(self, create_external_database_connector_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -6301,7 +6300,7 @@ def create_external_database_connector(self, create_external_database_connector_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6386,7 +6385,7 @@ def create_external_non_container_database(self, create_external_non_container_d "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_non_container_database got unknown kwargs: {extra_kwargs!r}") @@ -6397,7 +6396,7 @@ def create_external_non_container_database(self, create_external_non_container_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6483,7 +6482,7 @@ def create_external_pluggable_database(self, create_external_pluggable_database_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -6494,7 +6493,7 @@ def create_external_pluggable_database(self, create_external_pluggable_database_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6579,7 +6578,7 @@ def create_key_store(self, create_key_store_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_key_store got unknown kwargs: {extra_kwargs!r}") @@ -6590,7 +6589,7 @@ def create_key_store(self, create_key_store_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6678,7 +6677,7 @@ def create_maintenance_run(self, create_maintenance_run_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_maintenance_run got unknown kwargs: {extra_kwargs!r}") @@ -6689,7 +6688,7 @@ def create_maintenance_run(self, create_maintenance_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6774,7 +6773,7 @@ def create_oneoff_patch(self, create_oneoff_patch_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oneoff_patch got unknown kwargs: {extra_kwargs!r}") @@ -6785,7 +6784,7 @@ def create_oneoff_patch(self, create_oneoff_patch_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6872,7 +6871,7 @@ def create_pluggable_database(self, create_pluggable_database_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -6883,7 +6882,7 @@ def create_pluggable_database(self, create_pluggable_database_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6969,7 +6968,7 @@ def create_vm_cluster(self, create_vm_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -6980,7 +6979,7 @@ def create_vm_cluster(self, create_vm_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7071,7 +7070,7 @@ def create_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -7080,10 +7079,10 @@ def create_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7092,7 +7091,7 @@ def create_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7200,7 +7199,7 @@ def db_node_action(self, db_node_id, action, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"db_node_action got unknown kwargs: {extra_kwargs!r}") @@ -7209,16 +7208,16 @@ def db_node_action(self, db_node_id, action, **kwargs): "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "action": action } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7226,7 +7225,7 @@ def db_node_action(self, db_node_id, action, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7313,7 +7312,7 @@ def delete_application_vip(self, application_vip_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application_vip got unknown kwargs: {extra_kwargs!r}") @@ -7322,10 +7321,10 @@ def delete_application_vip(self, application_vip_id, **kwargs): "applicationVipId": application_vip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7334,7 +7333,7 @@ def delete_application_vip(self, application_vip_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7416,7 +7415,7 @@ def delete_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -7425,10 +7424,10 @@ def delete_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7437,7 +7436,7 @@ def delete_autonomous_database(self, autonomous_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7519,7 +7518,7 @@ def delete_autonomous_database_backup(self, autonomous_database_backup_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -7528,10 +7527,10 @@ def delete_autonomous_database_backup(self, autonomous_database_backup_id, **kwa "autonomousDatabaseBackupId": autonomous_database_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7540,7 +7539,7 @@ def delete_autonomous_database_backup(self, autonomous_database_backup_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7622,7 +7621,7 @@ def delete_autonomous_database_software_image(self, autonomous_database_software "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_autonomous_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -7631,10 +7630,10 @@ def delete_autonomous_database_software_image(self, autonomous_database_software "autonomousDatabaseSoftwareImageId": autonomous_database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7643,7 +7642,7 @@ def delete_autonomous_database_software_image(self, autonomous_database_software "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7725,7 +7724,7 @@ def delete_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -7734,10 +7733,10 @@ def delete_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7746,7 +7745,7 @@ def delete_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7824,7 +7823,7 @@ def delete_backup(self, backup_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backup got unknown kwargs: {extra_kwargs!r}") @@ -7833,10 +7832,10 @@ def delete_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7844,7 +7843,7 @@ def delete_backup(self, backup_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7926,7 +7925,7 @@ def delete_backup_destination(self, backup_destination_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backup_destination got unknown kwargs: {extra_kwargs!r}") @@ -7935,10 +7934,10 @@ def delete_backup_destination(self, backup_destination_id, **kwargs): "backupDestinationId": backup_destination_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7947,7 +7946,7 @@ def delete_backup_destination(self, backup_destination_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8029,7 +8028,7 @@ def delete_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -8038,10 +8037,10 @@ def delete_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **k "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8050,7 +8049,7 @@ def delete_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8136,7 +8135,7 @@ def delete_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, * "is_delete_vm_clusters", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -8145,16 +8144,16 @@ def delete_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, * "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isDeleteVmClusters": kwargs.get("is_delete_vm_clusters", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8162,7 +8161,7 @@ def delete_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8246,7 +8245,7 @@ def delete_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -8255,10 +8254,10 @@ def delete_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8267,7 +8266,7 @@ def delete_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8348,7 +8347,7 @@ def delete_console_connection(self, db_node_id, console_connection_id, **kwargs) "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -8358,10 +8357,10 @@ def delete_console_connection(self, db_node_id, console_connection_id, **kwargs) "consoleConnectionId": console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8369,7 +8368,7 @@ def delete_console_connection(self, db_node_id, console_connection_id, **kwargs) "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8454,7 +8453,7 @@ def delete_console_history(self, db_node_id, console_history_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_console_history got unknown kwargs: {extra_kwargs!r}") @@ -8464,10 +8463,10 @@ def delete_console_history(self, db_node_id, console_history_id, **kwargs): "consoleHistoryId": console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8476,7 +8475,7 @@ def delete_console_history(self, db_node_id, console_history_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8568,7 +8567,7 @@ def delete_database(self, database_id, **kwargs): "perform_final_backup", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database got unknown kwargs: {extra_kwargs!r}") @@ -8577,16 +8576,16 @@ def delete_database(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "performFinalBackup": kwargs.get("perform_final_backup", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8594,7 +8593,7 @@ def delete_database(self, database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8674,7 +8673,7 @@ def delete_database_software_image(self, database_software_image_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -8683,10 +8682,10 @@ def delete_database_software_image(self, database_software_image_id, **kwargs): "databaseSoftwareImageId": database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8694,7 +8693,7 @@ def delete_database_software_image(self, database_software_image_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8782,7 +8781,7 @@ def delete_db_home(self, db_home_id, **kwargs): "if_match", "perform_final_backup" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_db_home got unknown kwargs: {extra_kwargs!r}") @@ -8791,23 +8790,23 @@ def delete_db_home(self, db_home_id, **kwargs): "dbHomeId": db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "performFinalBackup": kwargs.get("perform_final_backup", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8891,7 +8890,7 @@ def delete_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -8900,10 +8899,10 @@ def delete_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8912,7 +8911,7 @@ def delete_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8996,7 +8995,7 @@ def delete_external_container_database(self, external_container_database_id, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_container_database got unknown kwargs: {extra_kwargs!r}") @@ -9005,10 +9004,10 @@ def delete_external_container_database(self, external_container_database_id, **k "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9017,7 +9016,7 @@ def delete_external_container_database(self, external_container_database_id, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9102,7 +9101,7 @@ def delete_external_database_connector(self, external_database_connector_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -9111,10 +9110,10 @@ def delete_external_database_connector(self, external_database_connector_id, **k "externalDatabaseConnectorId": external_database_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9123,7 +9122,7 @@ def delete_external_database_connector(self, external_database_connector_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9205,7 +9204,7 @@ def delete_external_non_container_database(self, external_non_container_database "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_non_container_database got unknown kwargs: {extra_kwargs!r}") @@ -9214,10 +9213,10 @@ def delete_external_non_container_database(self, external_non_container_database "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9226,7 +9225,7 @@ def delete_external_non_container_database(self, external_non_container_database "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9309,7 +9308,7 @@ def delete_external_pluggable_database(self, external_pluggable_database_id, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -9318,10 +9317,10 @@ def delete_external_pluggable_database(self, external_pluggable_database_id, **k "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9330,7 +9329,7 @@ def delete_external_pluggable_database(self, external_pluggable_database_id, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9412,7 +9411,7 @@ def delete_key_store(self, key_store_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_key_store got unknown kwargs: {extra_kwargs!r}") @@ -9421,10 +9420,10 @@ def delete_key_store(self, key_store_id, **kwargs): "keyStoreId": key_store_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9433,7 +9432,7 @@ def delete_key_store(self, key_store_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9515,7 +9514,7 @@ def delete_oneoff_patch(self, oneoff_patch_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oneoff_patch got unknown kwargs: {extra_kwargs!r}") @@ -9524,10 +9523,10 @@ def delete_oneoff_patch(self, oneoff_patch_id, **kwargs): "oneoffPatchId": oneoff_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9536,7 +9535,7 @@ def delete_oneoff_patch(self, oneoff_patch_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9618,7 +9617,7 @@ def delete_pluggable_database(self, pluggable_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -9627,10 +9626,10 @@ def delete_pluggable_database(self, pluggable_database_id, **kwargs): "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9639,7 +9638,7 @@ def delete_pluggable_database(self, pluggable_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9721,7 +9720,7 @@ def delete_vm_cluster(self, vm_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -9730,10 +9729,10 @@ def delete_vm_cluster(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9742,7 +9741,7 @@ def delete_vm_cluster(self, vm_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9830,7 +9829,7 @@ def delete_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -9840,10 +9839,10 @@ def delete_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9852,7 +9851,7 @@ def delete_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9932,7 +9931,7 @@ def deregister_autonomous_database_data_safe(self, autonomous_database_id, **kwa "opc_request_id", "deregister_autonomous_database_data_safe_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deregister_autonomous_database_data_safe got unknown kwargs: {extra_kwargs!r}") @@ -9941,10 +9940,10 @@ def deregister_autonomous_database_data_safe(self, autonomous_database_id, **kwa "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9952,7 +9951,7 @@ def deregister_autonomous_database_data_safe(self, autonomous_database_id, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10030,7 +10029,7 @@ def disable_autonomous_database_management(self, autonomous_database_id, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_autonomous_database_management got unknown kwargs: {extra_kwargs!r}") @@ -10039,10 +10038,10 @@ def disable_autonomous_database_management(self, autonomous_database_id, **kwarg "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10050,7 +10049,7 @@ def disable_autonomous_database_management(self, autonomous_database_id, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10126,7 +10125,7 @@ def disable_autonomous_database_operations_insights(self, autonomous_database_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_autonomous_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -10135,10 +10134,10 @@ def disable_autonomous_database_operations_insights(self, autonomous_database_id "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10146,7 +10145,7 @@ def disable_autonomous_database_operations_insights(self, autonomous_database_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10236,7 +10235,7 @@ def disable_database_management(self, database_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_database_management got unknown kwargs: {extra_kwargs!r}") @@ -10245,10 +10244,10 @@ def disable_database_management(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10258,7 +10257,7 @@ def disable_database_management(self, database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10351,7 +10350,7 @@ def disable_external_container_database_database_management(self, external_conta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_container_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -10360,10 +10359,10 @@ def disable_external_container_database_database_management(self, external_conta "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10373,7 +10372,7 @@ def disable_external_container_database_database_management(self, external_conta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10464,7 +10463,7 @@ def disable_external_container_database_stack_monitoring(self, external_containe "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_container_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -10473,10 +10472,10 @@ def disable_external_container_database_stack_monitoring(self, external_containe "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10486,7 +10485,7 @@ def disable_external_container_database_stack_monitoring(self, external_containe "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10581,7 +10580,7 @@ def disable_external_non_container_database_database_management(self, external_n "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_non_container_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -10590,10 +10589,10 @@ def disable_external_non_container_database_database_management(self, external_n "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10603,7 +10602,7 @@ def disable_external_non_container_database_database_management(self, external_n "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10694,7 +10693,7 @@ def disable_external_non_container_database_operations_insights(self, external_n "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_non_container_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -10703,10 +10702,10 @@ def disable_external_non_container_database_operations_insights(self, external_n "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10716,7 +10715,7 @@ def disable_external_non_container_database_operations_insights(self, external_n "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10807,7 +10806,7 @@ def disable_external_non_container_database_stack_monitoring(self, external_non_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_non_container_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -10816,10 +10815,10 @@ def disable_external_non_container_database_stack_monitoring(self, external_non_ "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10829,7 +10828,7 @@ def disable_external_non_container_database_stack_monitoring(self, external_non_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10924,7 +10923,7 @@ def disable_external_pluggable_database_database_management(self, external_plugg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_pluggable_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -10933,10 +10932,10 @@ def disable_external_pluggable_database_database_management(self, external_plugg "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10946,7 +10945,7 @@ def disable_external_pluggable_database_database_management(self, external_plugg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11037,7 +11036,7 @@ def disable_external_pluggable_database_operations_insights(self, external_plugg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_pluggable_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -11046,10 +11045,10 @@ def disable_external_pluggable_database_operations_insights(self, external_plugg "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11059,7 +11058,7 @@ def disable_external_pluggable_database_operations_insights(self, external_plugg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11150,7 +11149,7 @@ def disable_external_pluggable_database_stack_monitoring(self, external_pluggabl "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_pluggable_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -11159,10 +11158,10 @@ def disable_external_pluggable_database_stack_monitoring(self, external_pluggabl "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11172,7 +11171,7 @@ def disable_external_pluggable_database_stack_monitoring(self, external_pluggabl "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11263,7 +11262,7 @@ def disable_pluggable_database_management(self, pluggable_database_id, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_pluggable_database_management got unknown kwargs: {extra_kwargs!r}") @@ -11272,10 +11271,10 @@ def disable_pluggable_database_management(self, pluggable_database_id, **kwargs) "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11285,7 +11284,7 @@ def disable_pluggable_database_management(self, pluggable_database_id, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11372,7 +11371,7 @@ def download_exadata_infrastructure_config_file(self, exadata_infrastructure_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_exadata_infrastructure_config_file got unknown kwargs: {extra_kwargs!r}") @@ -11381,10 +11380,10 @@ def download_exadata_infrastructure_config_file(self, exadata_infrastructure_id, "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11393,7 +11392,7 @@ def download_exadata_infrastructure_config_file(self, exadata_infrastructure_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11486,7 +11485,7 @@ def download_oneoff_patch(self, oneoff_patch_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_oneoff_patch got unknown kwargs: {extra_kwargs!r}") @@ -11495,10 +11494,10 @@ def download_oneoff_patch(self, oneoff_patch_id, **kwargs): "oneoffPatchId": oneoff_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11508,7 +11507,7 @@ def download_oneoff_patch(self, oneoff_patch_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11600,7 +11599,7 @@ def download_validation_report(self, exadata_infrastructure_id, vm_cluster_netwo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_validation_report got unknown kwargs: {extra_kwargs!r}") @@ -11610,10 +11609,10 @@ def download_validation_report(self, exadata_infrastructure_id, vm_cluster_netwo "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11622,7 +11621,7 @@ def download_validation_report(self, exadata_infrastructure_id, vm_cluster_netwo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11714,7 +11713,7 @@ def download_vm_cluster_network_config_file(self, exadata_infrastructure_id, vm_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_vm_cluster_network_config_file got unknown kwargs: {extra_kwargs!r}") @@ -11724,10 +11723,10 @@ def download_vm_cluster_network_config_file(self, exadata_infrastructure_id, vm_ "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11736,7 +11735,7 @@ def download_vm_cluster_network_config_file(self, exadata_infrastructure_id, vm_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11815,7 +11814,7 @@ def enable_autonomous_database_management(self, autonomous_database_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_autonomous_database_management got unknown kwargs: {extra_kwargs!r}") @@ -11824,10 +11823,10 @@ def enable_autonomous_database_management(self, autonomous_database_id, **kwargs "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11835,7 +11834,7 @@ def enable_autonomous_database_management(self, autonomous_database_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11911,7 +11910,7 @@ def enable_autonomous_database_operations_insights(self, autonomous_database_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_autonomous_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -11920,10 +11919,10 @@ def enable_autonomous_database_operations_insights(self, autonomous_database_id, "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11931,7 +11930,7 @@ def enable_autonomous_database_operations_insights(self, autonomous_database_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12024,7 +12023,7 @@ def enable_database_management(self, database_id, enable_database_management_det "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_database_management got unknown kwargs: {extra_kwargs!r}") @@ -12033,10 +12032,10 @@ def enable_database_management(self, database_id, enable_database_management_det "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12046,7 +12045,7 @@ def enable_database_management(self, database_id, enable_database_management_det "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12148,7 +12147,7 @@ def enable_external_container_database_database_management(self, external_contai "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_container_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -12157,10 +12156,10 @@ def enable_external_container_database_database_management(self, external_contai "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12170,7 +12169,7 @@ def enable_external_container_database_database_management(self, external_contai "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12266,7 +12265,7 @@ def enable_external_container_database_stack_monitoring(self, external_container "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_container_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -12275,10 +12274,10 @@ def enable_external_container_database_stack_monitoring(self, external_container "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12288,7 +12287,7 @@ def enable_external_container_database_stack_monitoring(self, external_container "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12388,7 +12387,7 @@ def enable_external_non_container_database_database_management(self, external_no "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_non_container_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -12397,10 +12396,10 @@ def enable_external_non_container_database_database_management(self, external_no "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12410,7 +12409,7 @@ def enable_external_non_container_database_database_management(self, external_no "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12506,7 +12505,7 @@ def enable_external_non_container_database_operations_insights(self, external_no "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_non_container_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -12515,10 +12514,10 @@ def enable_external_non_container_database_operations_insights(self, external_no "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12528,7 +12527,7 @@ def enable_external_non_container_database_operations_insights(self, external_no "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12624,7 +12623,7 @@ def enable_external_non_container_database_stack_monitoring(self, external_non_c "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_non_container_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -12633,10 +12632,10 @@ def enable_external_non_container_database_stack_monitoring(self, external_non_c "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12646,7 +12645,7 @@ def enable_external_non_container_database_stack_monitoring(self, external_non_c "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12746,7 +12745,7 @@ def enable_external_pluggable_database_database_management(self, external_plugga "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_pluggable_database_database_management got unknown kwargs: {extra_kwargs!r}") @@ -12755,10 +12754,10 @@ def enable_external_pluggable_database_database_management(self, external_plugga "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12768,7 +12767,7 @@ def enable_external_pluggable_database_database_management(self, external_plugga "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12864,7 +12863,7 @@ def enable_external_pluggable_database_operations_insights(self, external_plugga "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_pluggable_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -12873,10 +12872,10 @@ def enable_external_pluggable_database_operations_insights(self, external_plugga "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12886,7 +12885,7 @@ def enable_external_pluggable_database_operations_insights(self, external_plugga "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12982,7 +12981,7 @@ def enable_external_pluggable_database_stack_monitoring(self, external_pluggable "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_pluggable_database_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -12991,10 +12990,10 @@ def enable_external_pluggable_database_stack_monitoring(self, external_pluggable "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13004,7 +13003,7 @@ def enable_external_pluggable_database_stack_monitoring(self, external_pluggable "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13100,7 +13099,7 @@ def enable_pluggable_database_management(self, pluggable_database_id, enable_plu "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_pluggable_database_management got unknown kwargs: {extra_kwargs!r}") @@ -13109,10 +13108,10 @@ def enable_pluggable_database_management(self, pluggable_database_id, enable_plu "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13122,7 +13121,7 @@ def enable_pluggable_database_management(self, pluggable_database_id, enable_plu "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13226,7 +13225,7 @@ def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): "opc_request_id", "peer_db_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fail_over_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -13235,16 +13234,16 @@ def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "peerDbId": kwargs.get("peer_db_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -13253,7 +13252,7 @@ def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13343,7 +13342,7 @@ def failover_autonomous_container_database_dataguard_association(self, autonomou "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"failover_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -13353,10 +13352,10 @@ def failover_autonomous_container_database_dataguard_association(self, autonomou "autonomousContainerDatabaseDataguardAssociationId": autonomous_container_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13364,7 +13363,7 @@ def failover_autonomous_container_database_dataguard_association(self, autonomou "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13456,7 +13455,7 @@ def failover_data_guard_association(self, database_id, data_guard_association_id "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"failover_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -13466,10 +13465,10 @@ def failover_data_guard_association(self, database_id, data_guard_association_id "dataGuardAssociationId": data_guard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13477,7 +13476,7 @@ def failover_data_guard_association(self, database_id, data_guard_association_id "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13568,7 +13567,7 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -13577,10 +13576,10 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13589,7 +13588,7 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13681,7 +13680,7 @@ def generate_recommended_vm_cluster_network(self, exadata_infrastructure_id, gen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_recommended_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -13690,10 +13689,10 @@ def generate_recommended_vm_cluster_network(self, exadata_infrastructure_id, gen "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13702,7 +13701,7 @@ def generate_recommended_vm_cluster_network(self, exadata_infrastructure_id, gen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13783,7 +13782,7 @@ def get_application_vip(self, application_vip_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application_vip got unknown kwargs: {extra_kwargs!r}") @@ -13792,10 +13791,10 @@ def get_application_vip(self, application_vip_id, **kwargs): "applicationVipId": application_vip_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13803,7 +13802,7 @@ def get_application_vip(self, application_vip_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13873,7 +13872,7 @@ def get_autonomous_container_database(self, autonomous_container_database_id, ** api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/AutonomousContainerDatabase/GetAutonomousContainerDatabase" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -13882,10 +13881,10 @@ def get_autonomous_container_database(self, autonomous_container_database_id, ** "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13966,7 +13965,7 @@ def get_autonomous_container_database_dataguard_association(self, autonomous_con api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/AutonomousContainerDatabaseDataguardAssociation/GetAutonomousContainerDatabaseDataguardAssociation" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -13976,10 +13975,10 @@ def get_autonomous_container_database_dataguard_association(self, autonomous_con "autonomousContainerDatabaseDataguardAssociationId": autonomous_container_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14063,7 +14062,7 @@ def get_autonomous_container_database_resource_usage(self, autonomous_container_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_container_database_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -14072,10 +14071,10 @@ def get_autonomous_container_database_resource_usage(self, autonomous_container_ "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14083,7 +14082,7 @@ def get_autonomous_container_database_resource_usage(self, autonomous_container_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14161,7 +14160,7 @@ def get_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -14170,10 +14169,10 @@ def get_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14181,7 +14180,7 @@ def get_autonomous_database(self, autonomous_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14259,7 +14258,7 @@ def get_autonomous_database_backup(self, autonomous_database_backup_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -14268,10 +14267,10 @@ def get_autonomous_database_backup(self, autonomous_database_backup_id, **kwargs "autonomousDatabaseBackupId": autonomous_database_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14279,7 +14278,7 @@ def get_autonomous_database_backup(self, autonomous_database_backup_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14362,7 +14361,7 @@ def get_autonomous_database_dataguard_association(self, autonomous_database_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -14372,10 +14371,10 @@ def get_autonomous_database_dataguard_association(self, autonomous_database_id, "autonomousDatabaseDataguardAssociationId": autonomous_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14383,7 +14382,7 @@ def get_autonomous_database_dataguard_association(self, autonomous_database_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14456,7 +14455,7 @@ def get_autonomous_database_regional_wallet(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database_regional_wallet got unknown kwargs: {extra_kwargs!r}") @@ -14466,7 +14465,7 @@ def get_autonomous_database_regional_wallet(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14542,7 +14541,7 @@ def get_autonomous_database_software_image(self, autonomous_database_software_im "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -14551,10 +14550,10 @@ def get_autonomous_database_software_image(self, autonomous_database_software_im "autonomousDatabaseSoftwareImageId": autonomous_database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14562,7 +14561,7 @@ def get_autonomous_database_software_image(self, autonomous_database_software_im "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14640,7 +14639,7 @@ def get_autonomous_database_wallet(self, autonomous_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -14649,10 +14648,10 @@ def get_autonomous_database_wallet(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14660,7 +14659,7 @@ def get_autonomous_database_wallet(self, autonomous_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14730,7 +14729,7 @@ def get_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastructur api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/AutonomousExadataInfrastructure/GetAutonomousExadataInfrastructure" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -14739,10 +14738,10 @@ def get_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastructur "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14818,7 +14817,7 @@ def get_autonomous_patch(self, autonomous_patch_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/AutonomousPatch/GetAutonomousPatch" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_patch got unknown kwargs: {extra_kwargs!r}") @@ -14827,10 +14826,10 @@ def get_autonomous_patch(self, autonomous_patch_id, **kwargs): "autonomousPatchId": autonomous_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14914,7 +14913,7 @@ def get_autonomous_virtual_machine(self, autonomous_virtual_machine_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_virtual_machine got unknown kwargs: {extra_kwargs!r}") @@ -14923,10 +14922,10 @@ def get_autonomous_virtual_machine(self, autonomous_virtual_machine_id, **kwargs "autonomousVirtualMachineId": autonomous_virtual_machine_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14934,7 +14933,7 @@ def get_autonomous_virtual_machine(self, autonomous_virtual_machine_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15012,7 +15011,7 @@ def get_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -15021,10 +15020,10 @@ def get_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15032,7 +15031,7 @@ def get_autonomous_vm_cluster(self, autonomous_vm_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15110,7 +15109,7 @@ def get_autonomous_vm_cluster_resource_usage(self, autonomous_vm_cluster_id, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_autonomous_vm_cluster_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -15119,10 +15118,10 @@ def get_autonomous_vm_cluster_resource_usage(self, autonomous_vm_cluster_id, **k "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15130,7 +15129,7 @@ def get_autonomous_vm_cluster_resource_usage(self, autonomous_vm_cluster_id, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15200,7 +15199,7 @@ def get_backup(self, backup_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/Backup/GetBackup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backup got unknown kwargs: {extra_kwargs!r}") @@ -15209,10 +15208,10 @@ def get_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15296,7 +15295,7 @@ def get_backup_destination(self, backup_destination_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backup_destination got unknown kwargs: {extra_kwargs!r}") @@ -15305,10 +15304,10 @@ def get_backup_destination(self, backup_destination_id, **kwargs): "backupDestinationId": backup_destination_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15316,7 +15315,7 @@ def get_backup_destination(self, backup_destination_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15394,7 +15393,7 @@ def get_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -15403,10 +15402,10 @@ def get_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **kwar "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15414,7 +15413,7 @@ def get_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15492,7 +15491,7 @@ def get_cloud_autonomous_vm_cluster_resource_usage(self, cloud_autonomous_vm_clu "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_autonomous_vm_cluster_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -15501,10 +15500,10 @@ def get_cloud_autonomous_vm_cluster_resource_usage(self, cloud_autonomous_vm_clu "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15512,7 +15511,7 @@ def get_cloud_autonomous_vm_cluster_resource_usage(self, cloud_autonomous_vm_clu "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15590,7 +15589,7 @@ def get_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -15599,10 +15598,10 @@ def get_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, **kw "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15610,7 +15609,7 @@ def get_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15694,7 +15693,7 @@ def get_cloud_exadata_infrastructure_unallocated_resources(self, cloud_exadata_i "opc_request_id", "db_servers" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_exadata_infrastructure_unallocated_resources got unknown kwargs: {extra_kwargs!r}") @@ -15703,23 +15702,23 @@ def get_cloud_exadata_infrastructure_unallocated_resources(self, cloud_exadata_i "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "dbServers": self.base_client.generate_collection_format_param(kwargs.get("db_servers", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15799,7 +15798,7 @@ def get_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -15808,10 +15807,10 @@ def get_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15819,7 +15818,7 @@ def get_cloud_vm_cluster(self, cloud_vm_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15898,7 +15897,7 @@ def get_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_vm_cluster_iorm_config got unknown kwargs: {extra_kwargs!r}") @@ -15907,10 +15906,10 @@ def get_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, **kwargs): "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15918,7 +15917,7 @@ def get_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16001,7 +16000,7 @@ def get_cloud_vm_cluster_update(self, cloud_vm_cluster_id, update_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_vm_cluster_update got unknown kwargs: {extra_kwargs!r}") @@ -16011,10 +16010,10 @@ def get_cloud_vm_cluster_update(self, cloud_vm_cluster_id, update_id, **kwargs): "updateId": update_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16022,7 +16021,7 @@ def get_cloud_vm_cluster_update(self, cloud_vm_cluster_id, update_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16105,7 +16104,7 @@ def get_cloud_vm_cluster_update_history_entry(self, cloud_vm_cluster_id, update_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_vm_cluster_update_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -16115,10 +16114,10 @@ def get_cloud_vm_cluster_update_history_entry(self, cloud_vm_cluster_id, update_ "updateHistoryEntryId": update_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16126,7 +16125,7 @@ def get_cloud_vm_cluster_update_history_entry(self, cloud_vm_cluster_id, update_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16199,7 +16198,7 @@ def get_console_connection(self, db_node_id, console_connection_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/ConsoleConnection/GetConsoleConnection" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -16209,10 +16208,10 @@ def get_console_connection(self, db_node_id, console_connection_id, **kwargs): "consoleConnectionId": console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16299,7 +16298,7 @@ def get_console_history(self, db_node_id, console_history_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_console_history got unknown kwargs: {extra_kwargs!r}") @@ -16309,10 +16308,10 @@ def get_console_history(self, db_node_id, console_history_id, **kwargs): "consoleHistoryId": console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16320,7 +16319,7 @@ def get_console_history(self, db_node_id, console_history_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16401,7 +16400,7 @@ def get_console_history_content(self, db_node_id, console_history_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_console_history_content got unknown kwargs: {extra_kwargs!r}") @@ -16411,10 +16410,10 @@ def get_console_history_content(self, db_node_id, console_history_id, **kwargs): "consoleHistoryId": console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16422,7 +16421,7 @@ def get_console_history_content(self, db_node_id, console_history_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16497,7 +16496,7 @@ def get_data_guard_association(self, database_id, data_guard_association_id, **k api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/DataGuardAssociation/GetDataGuardAssociation" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -16507,10 +16506,10 @@ def get_data_guard_association(self, database_id, data_guard_association_id, **k "dataGuardAssociationId": data_guard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16586,7 +16585,7 @@ def get_database(self, database_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/Database/GetDatabase" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database got unknown kwargs: {extra_kwargs!r}") @@ -16595,10 +16594,10 @@ def get_database(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16674,7 +16673,7 @@ def get_database_software_image(self, database_software_image_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/DatabaseSoftwareImage/GetDatabaseSoftwareImage" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -16683,10 +16682,10 @@ def get_database_software_image(self, database_software_image_id, **kwargs): "databaseSoftwareImageId": database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16775,7 +16774,7 @@ def get_database_upgrade_history_entry(self, database_id, upgrade_history_entry_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_upgrade_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -16785,10 +16784,10 @@ def get_database_upgrade_history_entry(self, database_id, upgrade_history_entry_ "upgradeHistoryEntryId": upgrade_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16796,7 +16795,7 @@ def get_database_upgrade_history_entry(self, database_id, upgrade_history_entry_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16866,7 +16865,7 @@ def get_db_home(self, db_home_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/DbHome/GetDbHome" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_home got unknown kwargs: {extra_kwargs!r}") @@ -16875,10 +16874,10 @@ def get_db_home(self, db_home_id, **kwargs): "dbHomeId": db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16959,7 +16958,7 @@ def get_db_home_patch(self, db_home_id, patch_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/Patch/GetDbHomePatch" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_home_patch got unknown kwargs: {extra_kwargs!r}") @@ -16969,10 +16968,10 @@ def get_db_home_patch(self, db_home_id, patch_id, **kwargs): "patchId": patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17053,7 +17052,7 @@ def get_db_home_patch_history_entry(self, db_home_id, patch_history_entry_id, ** api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/PatchHistoryEntry/GetDbHomePatchHistoryEntry" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_home_patch_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -17063,10 +17062,10 @@ def get_db_home_patch_history_entry(self, db_home_id, patch_history_entry_id, ** "patchHistoryEntryId": patch_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17142,7 +17141,7 @@ def get_db_node(self, db_node_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/DbNode/GetDbNode" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_node got unknown kwargs: {extra_kwargs!r}") @@ -17151,10 +17150,10 @@ def get_db_node(self, db_node_id, **kwargs): "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17243,7 +17242,7 @@ def get_db_server(self, exadata_infrastructure_id, db_server_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_server got unknown kwargs: {extra_kwargs!r}") @@ -17252,23 +17251,23 @@ def get_db_server(self, exadata_infrastructure_id, db_server_id, **kwargs): "dbServerId": db_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "exadataInfrastructureId": exadata_infrastructure_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17347,7 +17346,7 @@ def get_db_system(self, db_system_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/DbSystem/GetDbSystem" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system got unknown kwargs: {extra_kwargs!r}") @@ -17356,10 +17355,10 @@ def get_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17440,7 +17439,7 @@ def get_db_system_patch(self, db_system_id, patch_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/Patch/GetDbSystemPatch" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system_patch got unknown kwargs: {extra_kwargs!r}") @@ -17450,10 +17449,10 @@ def get_db_system_patch(self, db_system_id, patch_id, **kwargs): "patchId": patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17534,7 +17533,7 @@ def get_db_system_patch_history_entry(self, db_system_id, patch_history_entry_id api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/PatchHistoryEntry/GetDbSystemPatchHistoryEntry" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system_patch_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -17544,10 +17543,10 @@ def get_db_system_patch_history_entry(self, db_system_id, patch_history_entry_id "patchHistoryEntryId": patch_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17636,7 +17635,7 @@ def get_db_system_upgrade_history_entry(self, db_system_id, upgrade_history_entr "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system_upgrade_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -17646,10 +17645,10 @@ def get_db_system_upgrade_history_entry(self, db_system_id, upgrade_history_entr "upgradeHistoryEntryId": upgrade_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17657,7 +17656,7 @@ def get_db_system_upgrade_history_entry(self, db_system_id, upgrade_history_entr "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17742,7 +17741,7 @@ def get_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): "opc_request_id", "excluded_fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -17751,10 +17750,10 @@ def get_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'excluded_fields' in kwargs: @@ -17768,14 +17767,14 @@ def get_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): query_params = { "excludedFields": self.base_client.generate_collection_format_param(kwargs.get("excluded_fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17855,7 +17854,7 @@ def get_exadata_infrastructure_ocpus(self, autonomous_exadata_infrastructure_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_exadata_infrastructure_ocpus got unknown kwargs: {extra_kwargs!r}") @@ -17864,10 +17863,10 @@ def get_exadata_infrastructure_ocpus(self, autonomous_exadata_infrastructure_id, "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17875,7 +17874,7 @@ def get_exadata_infrastructure_ocpus(self, autonomous_exadata_infrastructure_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17959,7 +17958,7 @@ def get_exadata_infrastructure_un_allocated_resources(self, exadata_infrastructu "opc_request_id", "db_servers" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_exadata_infrastructure_un_allocated_resources got unknown kwargs: {extra_kwargs!r}") @@ -17968,23 +17967,23 @@ def get_exadata_infrastructure_un_allocated_resources(self, exadata_infrastructu "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "dbServers": self.base_client.generate_collection_format_param(kwargs.get("db_servers", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18075,7 +18074,7 @@ def get_exadata_iorm_config(self, db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_exadata_iorm_config got unknown kwargs: {extra_kwargs!r}") @@ -18084,10 +18083,10 @@ def get_exadata_iorm_config(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18095,7 +18094,7 @@ def get_exadata_iorm_config(self, db_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18169,7 +18168,7 @@ def get_external_backup_job(self, backup_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/ExternalBackupJob/GetExternalBackupJob" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_backup_job got unknown kwargs: {extra_kwargs!r}") @@ -18178,10 +18177,10 @@ def get_external_backup_job(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18265,7 +18264,7 @@ def get_external_container_database(self, external_container_database_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_container_database got unknown kwargs: {extra_kwargs!r}") @@ -18274,10 +18273,10 @@ def get_external_container_database(self, external_container_database_id, **kwar "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18285,7 +18284,7 @@ def get_external_container_database(self, external_container_database_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18364,7 +18363,7 @@ def get_external_database_connector(self, external_database_connector_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -18373,10 +18372,10 @@ def get_external_database_connector(self, external_database_connector_id, **kwar "externalDatabaseConnectorId": external_database_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18384,7 +18383,7 @@ def get_external_database_connector(self, external_database_connector_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18462,7 +18461,7 @@ def get_external_non_container_database(self, external_non_container_database_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_non_container_database got unknown kwargs: {extra_kwargs!r}") @@ -18471,10 +18470,10 @@ def get_external_non_container_database(self, external_non_container_database_id "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18482,7 +18481,7 @@ def get_external_non_container_database(self, external_non_container_database_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18561,7 +18560,7 @@ def get_external_pluggable_database(self, external_pluggable_database_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -18570,10 +18569,10 @@ def get_external_pluggable_database(self, external_pluggable_database_id, **kwar "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18581,7 +18580,7 @@ def get_external_pluggable_database(self, external_pluggable_database_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18670,7 +18669,7 @@ def get_infrastructure_target_versions(self, compartment_id, **kwargs): "target_resource_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_infrastructure_target_versions got unknown kwargs: {extra_kwargs!r}") @@ -18687,14 +18686,14 @@ def get_infrastructure_target_versions(self, compartment_id, **kwargs): "targetResourceId": kwargs.get("target_resource_id", missing), "targetResourceType": kwargs.get("target_resource_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18772,7 +18771,7 @@ def get_key_store(self, key_store_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_key_store got unknown kwargs: {extra_kwargs!r}") @@ -18781,10 +18780,10 @@ def get_key_store(self, key_store_id, **kwargs): "keyStoreId": key_store_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18792,7 +18791,7 @@ def get_key_store(self, key_store_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18860,7 +18859,7 @@ def get_maintenance_run(self, maintenance_run_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/MaintenanceRun/GetMaintenanceRun" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_maintenance_run got unknown kwargs: {extra_kwargs!r}") @@ -18869,10 +18868,10 @@ def get_maintenance_run(self, maintenance_run_id, **kwargs): "maintenanceRunId": maintenance_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18946,7 +18945,7 @@ def get_maintenance_run_history(self, maintenance_run_history_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/MaintenanceRunHistory/GetMaintenanceRunHistory" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_maintenance_run_history got unknown kwargs: {extra_kwargs!r}") @@ -18955,10 +18954,10 @@ def get_maintenance_run_history(self, maintenance_run_history_id, **kwargs): "maintenanceRunHistoryId": maintenance_run_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19042,7 +19041,7 @@ def get_oneoff_patch(self, oneoff_patch_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oneoff_patch got unknown kwargs: {extra_kwargs!r}") @@ -19051,10 +19050,10 @@ def get_oneoff_patch(self, oneoff_patch_id, **kwargs): "oneoffPatchId": oneoff_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19062,7 +19061,7 @@ def get_oneoff_patch(self, oneoff_patch_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19145,7 +19144,7 @@ def get_pdb_conversion_history_entry(self, database_id, pdb_conversion_history_e "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pdb_conversion_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -19155,10 +19154,10 @@ def get_pdb_conversion_history_entry(self, database_id, pdb_conversion_history_e "pdbConversionHistoryEntryId": pdb_conversion_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19166,7 +19165,7 @@ def get_pdb_conversion_history_entry(self, database_id, pdb_conversion_history_e "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19236,7 +19235,7 @@ def get_pluggable_database(self, pluggable_database_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/PluggableDatabase/GetPluggableDatabase" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -19245,10 +19244,10 @@ def get_pluggable_database(self, pluggable_database_id, **kwargs): "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19332,7 +19331,7 @@ def get_vm_cluster(self, vm_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -19341,10 +19340,10 @@ def get_vm_cluster(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19352,7 +19351,7 @@ def get_vm_cluster(self, vm_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19436,7 +19435,7 @@ def get_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_network_i "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -19446,10 +19445,10 @@ def get_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_network_i "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19457,7 +19456,7 @@ def get_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_network_i "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19532,7 +19531,7 @@ def get_vm_cluster_patch(self, vm_cluster_id, patch_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/Patch/GetVmClusterPatch" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster_patch got unknown kwargs: {extra_kwargs!r}") @@ -19542,10 +19541,10 @@ def get_vm_cluster_patch(self, vm_cluster_id, patch_id, **kwargs): "patchId": patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19626,7 +19625,7 @@ def get_vm_cluster_patch_history_entry(self, vm_cluster_id, patch_history_entry_ api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/PatchHistoryEntry/GetVmClusterPatchHistoryEntry" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster_patch_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -19636,10 +19635,10 @@ def get_vm_cluster_patch_history_entry(self, vm_cluster_id, patch_history_entry_ "patchHistoryEntryId": patch_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19728,7 +19727,7 @@ def get_vm_cluster_update(self, vm_cluster_id, update_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster_update got unknown kwargs: {extra_kwargs!r}") @@ -19738,10 +19737,10 @@ def get_vm_cluster_update(self, vm_cluster_id, update_id, **kwargs): "updateId": update_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19749,7 +19748,7 @@ def get_vm_cluster_update(self, vm_cluster_id, update_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19832,7 +19831,7 @@ def get_vm_cluster_update_history_entry(self, vm_cluster_id, update_history_entr "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vm_cluster_update_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -19842,10 +19841,10 @@ def get_vm_cluster_update_history_entry(self, vm_cluster_id, update_history_entr "updateHistoryEntryId": update_history_entry_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19853,7 +19852,7 @@ def get_vm_cluster_update_history_entry(self, vm_cluster_id, update_history_entr "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19933,7 +19932,7 @@ def launch_autonomous_exadata_infrastructure(self, launch_autonomous_exadata_inf "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"launch_autonomous_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -19943,7 +19942,7 @@ def launch_autonomous_exadata_infrastructure(self, launch_autonomous_exadata_inf "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20045,7 +20044,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"launch_db_system got unknown kwargs: {extra_kwargs!r}") @@ -20055,7 +20054,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20168,7 +20167,7 @@ def list_application_vips(self, compartment_id, cloud_vm_cluster_id, **kwargs): "sort_by", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_application_vips got unknown kwargs: {extra_kwargs!r}") @@ -20203,14 +20202,14 @@ def list_application_vips(self, compartment_id, cloud_vm_cluster_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20292,7 +20291,7 @@ def list_autonomous_container_database_dataguard_associations(self, autonomous_c "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_container_database_dataguard_associations got unknown kwargs: {extra_kwargs!r}") @@ -20301,17 +20300,17 @@ def list_autonomous_container_database_dataguard_associations(self, autonomous_c "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20415,7 +20414,7 @@ def list_autonomous_container_database_versions(self, compartment_id, service_co "opc_request_id", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_container_database_versions got unknown kwargs: {extra_kwargs!r}") @@ -20440,14 +20439,14 @@ def list_autonomous_container_database_versions(self, compartment_id, service_co "sortOrder": kwargs.get("sort_order", missing), "serviceComponent": service_component } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20585,7 +20584,7 @@ def list_autonomous_container_databases(self, compartment_id, **kwargs): "service_level_agreement_type", "cloud_autonomous_vm_cluster_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_container_databases got unknown kwargs: {extra_kwargs!r}") @@ -20633,7 +20632,7 @@ def list_autonomous_container_databases(self, compartment_id, **kwargs): "serviceLevelAgreementType": kwargs.get("service_level_agreement_type", missing), "cloudAutonomousVmClusterId": kwargs.get("cloud_autonomous_vm_cluster_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20759,7 +20758,7 @@ def list_autonomous_database_backups(self, **kwargs): "type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_backups got unknown kwargs: {extra_kwargs!r}") @@ -20796,14 +20795,14 @@ def list_autonomous_database_backups(self, **kwargs): "displayName": kwargs.get("display_name", missing), "type": kwargs.get("type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20890,7 +20889,7 @@ def list_autonomous_database_character_sets(self, **kwargs): "is_dedicated", "character_set_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_character_sets got unknown kwargs: {extra_kwargs!r}") @@ -20907,14 +20906,14 @@ def list_autonomous_database_character_sets(self, **kwargs): "isDedicated": kwargs.get("is_dedicated", missing), "characterSetType": kwargs.get("character_set_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21035,7 +21034,7 @@ def list_autonomous_database_clones(self, compartment_id, autonomous_database_id "sort_by", "clone_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_clones got unknown kwargs: {extra_kwargs!r}") @@ -21044,10 +21043,10 @@ def list_autonomous_database_clones(self, compartment_id, autonomous_database_id "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -21088,14 +21087,14 @@ def list_autonomous_database_clones(self, compartment_id, autonomous_database_id "sortBy": kwargs.get("sort_by", missing), "cloneType": kwargs.get("clone_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21179,7 +21178,7 @@ def list_autonomous_database_dataguard_associations(self, autonomous_database_id "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_dataguard_associations got unknown kwargs: {extra_kwargs!r}") @@ -21188,17 +21187,17 @@ def list_autonomous_database_dataguard_associations(self, autonomous_database_id "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21291,7 +21290,7 @@ def list_autonomous_database_refreshable_clones(self, autonomous_database_id, ** "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_refreshable_clones got unknown kwargs: {extra_kwargs!r}") @@ -21300,24 +21299,24 @@ def list_autonomous_database_refreshable_clones(self, autonomous_database_id, ** "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21432,7 +21431,7 @@ def list_autonomous_database_software_images(self, compartment_id, image_shape_f "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_database_software_images got unknown kwargs: {extra_kwargs!r}") @@ -21474,14 +21473,14 @@ def list_autonomous_database_software_images(self, compartment_id, image_shape_f "displayName": kwargs.get("display_name", missing), "imageShapeFamily": image_shape_family } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21637,7 +21636,7 @@ def list_autonomous_databases(self, compartment_id, **kwargs): "is_resource_pool_leader", "resource_pool_leader_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_databases got unknown kwargs: {extra_kwargs!r}") @@ -21695,14 +21694,14 @@ def list_autonomous_databases(self, compartment_id, **kwargs): "isResourcePoolLeader": kwargs.get("is_resource_pool_leader", missing), "resourcePoolLeaderId": kwargs.get("resource_pool_leader_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21803,7 +21802,7 @@ def list_autonomous_db_preview_versions(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_db_preview_versions got unknown kwargs: {extra_kwargs!r}") @@ -21829,14 +21828,14 @@ def list_autonomous_db_preview_versions(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21934,7 +21933,7 @@ def list_autonomous_db_versions(self, compartment_id, **kwargs): "db_workload", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_db_versions got unknown kwargs: {extra_kwargs!r}") @@ -21960,14 +21959,14 @@ def list_autonomous_db_versions(self, compartment_id, **kwargs): "dbWorkload": kwargs.get("db_workload", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22056,7 +22055,7 @@ def list_autonomous_exadata_infrastructure_shapes(self, availability_domain, com "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_exadata_infrastructure_shapes got unknown kwargs: {extra_kwargs!r}") @@ -22067,14 +22066,14 @@ def list_autonomous_exadata_infrastructure_shapes(self, availability_domain, com "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22184,7 +22183,7 @@ def list_autonomous_exadata_infrastructures(self, compartment_id, **kwargs): "availability_domain", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_exadata_infrastructures got unknown kwargs: {extra_kwargs!r}") @@ -22220,7 +22219,7 @@ def list_autonomous_exadata_infrastructures(self, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22322,7 +22321,7 @@ def list_autonomous_virtual_machines(self, compartment_id, autonomous_vm_cluster "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_virtual_machines got unknown kwargs: {extra_kwargs!r}") @@ -22341,14 +22340,14 @@ def list_autonomous_virtual_machines(self, compartment_id, autonomous_vm_cluster "page": kwargs.get("page", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22440,7 +22439,7 @@ def list_autonomous_vm_cluster_acd_resource_usage(self, autonomous_vm_cluster_id "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_vm_cluster_acd_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -22449,10 +22448,10 @@ def list_autonomous_vm_cluster_acd_resource_usage(self, autonomous_vm_cluster_id "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -22460,14 +22459,14 @@ def list_autonomous_vm_cluster_acd_resource_usage(self, autonomous_vm_cluster_id "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22581,7 +22580,7 @@ def list_autonomous_vm_clusters(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_autonomous_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -22617,14 +22616,14 @@ def list_autonomous_vm_clusters(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22714,7 +22713,7 @@ def list_backup_destination(self, compartment_id, **kwargs): "opc_request_id", "type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backup_destination got unknown kwargs: {extra_kwargs!r}") @@ -22725,14 +22724,14 @@ def list_backup_destination(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "type": kwargs.get("type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22821,7 +22820,7 @@ def list_backups(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backups got unknown kwargs: {extra_kwargs!r}") @@ -22832,7 +22831,7 @@ def list_backups(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22930,7 +22929,7 @@ def list_cloud_autonomous_vm_cluster_acd_resource_usage(self, cloud_autonomous_v "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_autonomous_vm_cluster_acd_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -22939,10 +22938,10 @@ def list_cloud_autonomous_vm_cluster_acd_resource_usage(self, cloud_autonomous_v "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -22950,14 +22949,14 @@ def list_cloud_autonomous_vm_cluster_acd_resource_usage(self, cloud_autonomous_v "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23075,7 +23074,7 @@ def list_cloud_autonomous_vm_clusters(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_autonomous_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -23112,14 +23111,14 @@ def list_cloud_autonomous_vm_clusters(self, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23231,7 +23230,7 @@ def list_cloud_exadata_infrastructures(self, compartment_id, **kwargs): "display_name", "cluster_placement_group_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_exadata_infrastructures got unknown kwargs: {extra_kwargs!r}") @@ -23267,14 +23266,14 @@ def list_cloud_exadata_infrastructures(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "clusterPlacementGroupId": kwargs.get("cluster_placement_group_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23366,7 +23365,7 @@ def list_cloud_vm_cluster_update_history_entries(self, cloud_vm_cluster_id, **kw "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_vm_cluster_update_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -23375,10 +23374,10 @@ def list_cloud_vm_cluster_update_history_entries(self, cloud_vm_cluster_id, **kw "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -23393,14 +23392,14 @@ def list_cloud_vm_cluster_update_history_entries(self, cloud_vm_cluster_id, **kw "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23494,7 +23493,7 @@ def list_cloud_vm_cluster_updates(self, cloud_vm_cluster_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_vm_cluster_updates got unknown kwargs: {extra_kwargs!r}") @@ -23503,10 +23502,10 @@ def list_cloud_vm_cluster_updates(self, cloud_vm_cluster_id, **kwargs): "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -23521,14 +23520,14 @@ def list_cloud_vm_cluster_updates(self, cloud_vm_cluster_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23642,7 +23641,7 @@ def list_cloud_vm_clusters(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -23678,14 +23677,14 @@ def list_cloud_vm_clusters(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23755,7 +23754,7 @@ def list_console_connections(self, db_node_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/ConsoleConnection/ListConsoleConnections" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_console_connections got unknown kwargs: {extra_kwargs!r}") @@ -23764,10 +23763,10 @@ def list_console_connections(self, db_node_id, **kwargs): "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23881,7 +23880,7 @@ def list_console_histories(self, db_node_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_console_histories got unknown kwargs: {extra_kwargs!r}") @@ -23890,10 +23889,10 @@ def list_console_histories(self, db_node_id, **kwargs): "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -23925,14 +23924,14 @@ def list_console_histories(self, db_node_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24027,7 +24026,7 @@ def list_container_database_patches(self, autonomous_container_database_id, comp "page", "autonomous_patch_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_database_patches got unknown kwargs: {extra_kwargs!r}") @@ -24036,10 +24035,10 @@ def list_container_database_patches(self, autonomous_container_database_id, comp "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'autonomous_patch_type' in kwargs: @@ -24055,7 +24054,7 @@ def list_container_database_patches(self, autonomous_container_database_id, comp "compartmentId": compartment_id, "autonomousPatchType": kwargs.get("autonomous_patch_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24144,7 +24143,7 @@ def list_data_guard_associations(self, database_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_guard_associations got unknown kwargs: {extra_kwargs!r}") @@ -24153,17 +24152,17 @@ def list_data_guard_associations(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24290,7 +24289,7 @@ def list_database_software_images(self, compartment_id, **kwargs): "image_shape_family", "is_upgrade_supported" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_software_images got unknown kwargs: {extra_kwargs!r}") @@ -24342,7 +24341,7 @@ def list_database_software_images(self, compartment_id, **kwargs): "imageShapeFamily": kwargs.get("image_shape_family", missing), "isUpgradeSupported": kwargs.get("is_upgrade_supported", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24457,7 +24456,7 @@ def list_database_upgrade_history_entries(self, database_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_upgrade_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -24466,10 +24465,10 @@ def list_database_upgrade_history_entries(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'upgrade_action' in kwargs: @@ -24508,14 +24507,14 @@ def list_database_upgrade_history_entries(self, database_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24633,7 +24632,7 @@ def list_databases(self, compartment_id, **kwargs): "lifecycle_state", "db_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_databases got unknown kwargs: {extra_kwargs!r}") @@ -24670,7 +24669,7 @@ def list_databases(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "dbName": kwargs.get("db_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24757,7 +24756,7 @@ def list_db_home_patch_history_entries(self, db_home_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_home_patch_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -24766,17 +24765,17 @@ def list_db_home_patch_history_entries(self, db_home_id, **kwargs): "dbHomeId": db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24865,7 +24864,7 @@ def list_db_home_patches(self, db_home_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_home_patches got unknown kwargs: {extra_kwargs!r}") @@ -24874,17 +24873,17 @@ def list_db_home_patches(self, db_home_id, **kwargs): "dbHomeId": db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25017,7 +25016,7 @@ def list_db_homes(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_homes got unknown kwargs: {extra_kwargs!r}") @@ -25056,7 +25055,7 @@ def list_db_homes(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25179,7 +25178,7 @@ def list_db_nodes(self, compartment_id, **kwargs): "lifecycle_state", "db_server_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_nodes got unknown kwargs: {extra_kwargs!r}") @@ -25216,7 +25215,7 @@ def list_db_nodes(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "dbServerId": kwargs.get("db_server_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25334,7 +25333,7 @@ def list_db_servers(self, compartment_id, exadata_infrastructure_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_servers got unknown kwargs: {extra_kwargs!r}") @@ -25370,14 +25369,14 @@ def list_db_servers(self, compartment_id, exadata_infrastructure_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25454,7 +25453,7 @@ def list_db_system_compute_performances(self, **kwargs): "db_system_shape", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_compute_performances got unknown kwargs: {extra_kwargs!r}") @@ -25462,14 +25461,14 @@ def list_db_system_compute_performances(self, **kwargs): query_params = { "dbSystemShape": kwargs.get("db_system_shape", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25551,7 +25550,7 @@ def list_db_system_patch_history_entries(self, db_system_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_patch_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -25560,17 +25559,17 @@ def list_db_system_patch_history_entries(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25659,7 +25658,7 @@ def list_db_system_patches(self, db_system_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_patches got unknown kwargs: {extra_kwargs!r}") @@ -25668,17 +25667,17 @@ def list_db_system_patches(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25771,7 +25770,7 @@ def list_db_system_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_shapes got unknown kwargs: {extra_kwargs!r}") @@ -25782,7 +25781,7 @@ def list_db_system_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25871,7 +25870,7 @@ def list_db_system_storage_performances(self, storage_management, **kwargs): "shape_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_storage_performances got unknown kwargs: {extra_kwargs!r}") @@ -25886,14 +25885,14 @@ def list_db_system_storage_performances(self, storage_management, **kwargs): "storageManagement": storage_management, "shapeType": kwargs.get("shape_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26003,7 +26002,7 @@ def list_db_system_upgrade_history_entries(self, db_system_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_system_upgrade_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -26012,10 +26011,10 @@ def list_db_system_upgrade_history_entries(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -26054,14 +26053,14 @@ def list_db_system_upgrade_history_entries(self, db_system_id, **kwargs): "upgradeAction": kwargs.get("upgrade_action", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26186,7 +26185,7 @@ def list_db_systems(self, compartment_id, **kwargs): "availability_domain", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_systems got unknown kwargs: {extra_kwargs!r}") @@ -26223,7 +26222,7 @@ def list_db_systems(self, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -26336,7 +26335,7 @@ def list_db_versions(self, compartment_id, **kwargs): "is_upgrade_supported", "is_database_software_image_supported" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_versions got unknown kwargs: {extra_kwargs!r}") @@ -26358,7 +26357,7 @@ def list_db_versions(self, compartment_id, **kwargs): "isUpgradeSupported": kwargs.get("is_upgrade_supported", missing), "isDatabaseSoftwareImageSupported": kwargs.get("is_database_software_image_supported", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -26478,7 +26477,7 @@ def list_exadata_infrastructures(self, compartment_id, **kwargs): "display_name", "excluded_fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_exadata_infrastructures got unknown kwargs: {extra_kwargs!r}") @@ -26522,14 +26521,14 @@ def list_exadata_infrastructures(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "excludedFields": self.base_client.generate_collection_format_param(kwargs.get("excluded_fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26640,7 +26639,7 @@ def list_external_container_databases(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_container_databases got unknown kwargs: {extra_kwargs!r}") @@ -26675,14 +26674,14 @@ def list_external_container_databases(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26798,7 +26797,7 @@ def list_external_database_connectors(self, compartment_id, external_database_id "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_database_connectors got unknown kwargs: {extra_kwargs!r}") @@ -26834,14 +26833,14 @@ def list_external_database_connectors(self, compartment_id, external_database_id "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26952,7 +26951,7 @@ def list_external_non_container_databases(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_non_container_databases got unknown kwargs: {extra_kwargs!r}") @@ -26987,14 +26986,14 @@ def list_external_non_container_databases(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27112,7 +27111,7 @@ def list_external_pluggable_databases(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_pluggable_databases got unknown kwargs: {extra_kwargs!r}") @@ -27148,14 +27147,14 @@ def list_external_pluggable_databases(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27253,7 +27252,7 @@ def list_flex_components(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_flex_components got unknown kwargs: {extra_kwargs!r}") @@ -27280,7 +27279,7 @@ def list_flex_components(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -27377,7 +27376,7 @@ def list_gi_versions(self, compartment_id, **kwargs): "sort_order", "shape" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_gi_versions got unknown kwargs: {extra_kwargs!r}") @@ -27396,7 +27395,7 @@ def list_gi_versions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "shape": kwargs.get("shape", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -27487,7 +27486,7 @@ def list_key_stores(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_key_stores got unknown kwargs: {extra_kwargs!r}") @@ -27497,14 +27496,14 @@ def list_key_stores(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27632,7 +27631,7 @@ def list_maintenance_run_history(self, compartment_id, **kwargs): "availability_domain", "maintenance_subtype" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_maintenance_run_history got unknown kwargs: {extra_kwargs!r}") @@ -27692,7 +27691,7 @@ def list_maintenance_run_history(self, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "maintenanceSubtype": kwargs.get("maintenance_subtype", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -27825,7 +27824,7 @@ def list_maintenance_runs(self, compartment_id, **kwargs): "availability_domain", "maintenance_subtype" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_maintenance_runs got unknown kwargs: {extra_kwargs!r}") @@ -27885,7 +27884,7 @@ def list_maintenance_runs(self, compartment_id, **kwargs): "availabilityDomain": kwargs.get("availability_domain", missing), "maintenanceSubtype": kwargs.get("maintenance_subtype", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -27998,7 +27997,7 @@ def list_oneoff_patches(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oneoff_patches got unknown kwargs: {extra_kwargs!r}") @@ -28033,14 +28032,14 @@ def list_oneoff_patches(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28150,7 +28149,7 @@ def list_pdb_conversion_history_entries(self, database_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pdb_conversion_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -28159,10 +28158,10 @@ def list_pdb_conversion_history_entries(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'pdb_conversion_action' in kwargs: @@ -28201,14 +28200,14 @@ def list_pdb_conversion_history_entries(self, database_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28321,7 +28320,7 @@ def list_pluggable_databases(self, **kwargs): "lifecycle_state", "pdb_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pluggable_databases got unknown kwargs: {extra_kwargs!r}") @@ -28357,7 +28356,7 @@ def list_pluggable_databases(self, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "pdbName": kwargs.get("pdb_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -28460,7 +28459,7 @@ def list_system_versions(self, compartment_id, shape, gi_version, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_system_versions got unknown kwargs: {extra_kwargs!r}") @@ -28480,14 +28479,14 @@ def list_system_versions(self, compartment_id, shape, gi_version, **kwargs): "shape": shape, "giVersion": gi_version } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28600,7 +28599,7 @@ def list_vm_cluster_networks(self, exadata_infrastructure_id, compartment_id, ** "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_cluster_networks got unknown kwargs: {extra_kwargs!r}") @@ -28609,10 +28608,10 @@ def list_vm_cluster_networks(self, exadata_infrastructure_id, compartment_id, ** "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -28645,14 +28644,14 @@ def list_vm_cluster_networks(self, exadata_infrastructure_id, compartment_id, ** "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28736,7 +28735,7 @@ def list_vm_cluster_patch_history_entries(self, vm_cluster_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_cluster_patch_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -28745,17 +28744,17 @@ def list_vm_cluster_patch_history_entries(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -28844,7 +28843,7 @@ def list_vm_cluster_patches(self, vm_cluster_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_cluster_patches got unknown kwargs: {extra_kwargs!r}") @@ -28853,17 +28852,17 @@ def list_vm_cluster_patches(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -28968,7 +28967,7 @@ def list_vm_cluster_update_history_entries(self, vm_cluster_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_cluster_update_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -28977,10 +28976,10 @@ def list_vm_cluster_update_history_entries(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -29003,14 +29002,14 @@ def list_vm_cluster_update_history_entries(self, vm_cluster_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29110,7 +29109,7 @@ def list_vm_cluster_updates(self, vm_cluster_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_cluster_updates got unknown kwargs: {extra_kwargs!r}") @@ -29119,10 +29118,10 @@ def list_vm_cluster_updates(self, vm_cluster_id, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -29145,14 +29144,14 @@ def list_vm_cluster_updates(self, vm_cluster_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29267,7 +29266,7 @@ def list_vm_clusters(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -29303,14 +29302,14 @@ def list_vm_clusters(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29406,7 +29405,7 @@ def local_clone_pluggable_database(self, local_clone_pluggable_database_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"local_clone_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -29415,10 +29414,10 @@ def local_clone_pluggable_database(self, local_clone_pluggable_database_details, "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29428,7 +29427,7 @@ def local_clone_pluggable_database(self, local_clone_pluggable_database_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29526,7 +29525,7 @@ def migrate_exadata_db_system_resource_model(self, db_system_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"migrate_exadata_db_system_resource_model got unknown kwargs: {extra_kwargs!r}") @@ -29535,10 +29534,10 @@ def migrate_exadata_db_system_resource_model(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29548,7 +29547,7 @@ def migrate_exadata_db_system_resource_model(self, db_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29646,7 +29645,7 @@ def migrate_vault_key(self, database_id, migrate_vault_key_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"migrate_vault_key got unknown kwargs: {extra_kwargs!r}") @@ -29655,10 +29654,10 @@ def migrate_vault_key(self, database_id, migrate_vault_key_details, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29668,7 +29667,7 @@ def migrate_vault_key(self, database_id, migrate_vault_key_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29766,7 +29765,7 @@ def modify_database_management(self, database_id, modify_database_management_det "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"modify_database_management got unknown kwargs: {extra_kwargs!r}") @@ -29775,10 +29774,10 @@ def modify_database_management(self, database_id, modify_database_management_det "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29788,7 +29787,7 @@ def modify_database_management(self, database_id, modify_database_management_det "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29886,7 +29885,7 @@ def modify_pluggable_database_management(self, pluggable_database_id, modify_plu "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"modify_pluggable_database_management got unknown kwargs: {extra_kwargs!r}") @@ -29895,10 +29894,10 @@ def modify_pluggable_database_management(self, pluggable_database_id, modify_plu "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29908,7 +29907,7 @@ def modify_pluggable_database_management(self, pluggable_database_id, modify_plu "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30003,7 +30002,7 @@ def refresh_pluggable_database(self, pluggable_database_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -30012,10 +30011,10 @@ def refresh_pluggable_database(self, pluggable_database_id, **kwargs): "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30025,7 +30024,7 @@ def refresh_pluggable_database(self, pluggable_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30108,7 +30107,7 @@ def register_autonomous_database_data_safe(self, autonomous_database_id, **kwarg "opc_request_id", "register_autonomous_database_data_safe_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"register_autonomous_database_data_safe got unknown kwargs: {extra_kwargs!r}") @@ -30117,10 +30116,10 @@ def register_autonomous_database_data_safe(self, autonomous_database_id, **kwarg "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30128,7 +30127,7 @@ def register_autonomous_database_data_safe(self, autonomous_database_id, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30213,7 +30212,7 @@ def reinstate_autonomous_container_database_dataguard_association(self, autonomo "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reinstate_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -30223,10 +30222,10 @@ def reinstate_autonomous_container_database_dataguard_association(self, autonomo "autonomousContainerDatabaseDataguardAssociationId": autonomous_container_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30234,7 +30233,7 @@ def reinstate_autonomous_container_database_dataguard_association(self, autonomo "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30322,7 +30321,7 @@ def reinstate_data_guard_association(self, database_id, data_guard_association_i "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reinstate_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -30332,10 +30331,10 @@ def reinstate_data_guard_association(self, database_id, data_guard_association_i "dataGuardAssociationId": data_guard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30343,7 +30342,7 @@ def reinstate_data_guard_association(self, database_id, data_guard_association_i "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30442,7 +30441,7 @@ def remote_clone_pluggable_database(self, remote_clone_pluggable_database_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remote_clone_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -30451,10 +30450,10 @@ def remote_clone_pluggable_database(self, remote_clone_pluggable_database_detail "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30464,7 +30463,7 @@ def remote_clone_pluggable_database(self, remote_clone_pluggable_database_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30562,7 +30561,7 @@ def remove_virtual_machine_from_cloud_vm_cluster(self, remove_virtual_machine_fr "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_virtual_machine_from_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -30571,10 +30570,10 @@ def remove_virtual_machine_from_cloud_vm_cluster(self, remove_virtual_machine_fr "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30584,7 +30583,7 @@ def remove_virtual_machine_from_cloud_vm_cluster(self, remove_virtual_machine_fr "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30682,7 +30681,7 @@ def remove_virtual_machine_from_vm_cluster(self, remove_virtual_machine_from_vm_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_virtual_machine_from_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -30691,10 +30690,10 @@ def remove_virtual_machine_from_vm_cluster(self, remove_virtual_machine_from_vm_ "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30704,7 +30703,7 @@ def remove_virtual_machine_from_vm_cluster(self, remove_virtual_machine_from_vm_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30808,7 +30807,7 @@ def resize_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resize_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -30818,10 +30817,10 @@ def resize_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30831,7 +30830,7 @@ def resize_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30929,7 +30928,7 @@ def resource_pool_shapes(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resource_pool_shapes got unknown kwargs: {extra_kwargs!r}") @@ -30938,7 +30937,7 @@ def resource_pool_shapes(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -30947,7 +30946,7 @@ def resource_pool_shapes(self, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31032,7 +31031,7 @@ def restart_autonomous_container_database(self, autonomous_container_database_id "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -31041,10 +31040,10 @@ def restart_autonomous_container_database(self, autonomous_container_database_id "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31053,7 +31052,7 @@ def restart_autonomous_container_database(self, autonomous_container_database_id "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31133,7 +31132,7 @@ def restart_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -31142,10 +31141,10 @@ def restart_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31153,7 +31152,7 @@ def restart_autonomous_database(self, autonomous_database_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31236,7 +31235,7 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -31245,10 +31244,10 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31256,7 +31255,7 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31341,7 +31340,7 @@ def restore_database(self, database_id, restore_database_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_database got unknown kwargs: {extra_kwargs!r}") @@ -31350,10 +31349,10 @@ def restore_database(self, database_id, restore_database_details, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31361,7 +31360,7 @@ def restore_database(self, database_id, restore_database_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31457,7 +31456,7 @@ def rotate_autonomous_container_database_encryption_key(self, autonomous_contain "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_autonomous_container_database_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -31466,10 +31465,10 @@ def rotate_autonomous_container_database_encryption_key(self, autonomous_contain "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31479,7 +31478,7 @@ def rotate_autonomous_container_database_encryption_key(self, autonomous_contain "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31574,7 +31573,7 @@ def rotate_autonomous_database_encryption_key(self, autonomous_database_id, **kw "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_autonomous_database_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -31583,10 +31582,10 @@ def rotate_autonomous_database_encryption_key(self, autonomous_database_id, **kw "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31596,7 +31595,7 @@ def rotate_autonomous_database_encryption_key(self, autonomous_database_id, **kw "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31692,7 +31691,7 @@ def rotate_autonomous_vm_cluster_ords_certs(self, rotate_autonomous_vm_cluster_o "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_autonomous_vm_cluster_ords_certs got unknown kwargs: {extra_kwargs!r}") @@ -31701,10 +31700,10 @@ def rotate_autonomous_vm_cluster_ords_certs(self, rotate_autonomous_vm_cluster_o "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31714,7 +31713,7 @@ def rotate_autonomous_vm_cluster_ords_certs(self, rotate_autonomous_vm_cluster_o "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31810,7 +31809,7 @@ def rotate_autonomous_vm_cluster_ssl_certs(self, rotate_autonomous_vm_cluster_ss "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_autonomous_vm_cluster_ssl_certs got unknown kwargs: {extra_kwargs!r}") @@ -31819,10 +31818,10 @@ def rotate_autonomous_vm_cluster_ssl_certs(self, rotate_autonomous_vm_cluster_ss "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31832,7 +31831,7 @@ def rotate_autonomous_vm_cluster_ssl_certs(self, rotate_autonomous_vm_cluster_ss "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31929,7 +31928,7 @@ def rotate_cloud_autonomous_vm_cluster_ords_certs(self, cloud_autonomous_vm_clus "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_cloud_autonomous_vm_cluster_ords_certs got unknown kwargs: {extra_kwargs!r}") @@ -31938,10 +31937,10 @@ def rotate_cloud_autonomous_vm_cluster_ords_certs(self, cloud_autonomous_vm_clus "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -31951,7 +31950,7 @@ def rotate_cloud_autonomous_vm_cluster_ords_certs(self, cloud_autonomous_vm_clus "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32048,7 +32047,7 @@ def rotate_cloud_autonomous_vm_cluster_ssl_certs(self, cloud_autonomous_vm_clust "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_cloud_autonomous_vm_cluster_ssl_certs got unknown kwargs: {extra_kwargs!r}") @@ -32057,10 +32056,10 @@ def rotate_cloud_autonomous_vm_cluster_ssl_certs(self, cloud_autonomous_vm_clust "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32070,7 +32069,7 @@ def rotate_cloud_autonomous_vm_cluster_ssl_certs(self, cloud_autonomous_vm_clust "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32163,7 +32162,7 @@ def rotate_ords_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_ords_certs got unknown kwargs: {extra_kwargs!r}") @@ -32172,10 +32171,10 @@ def rotate_ords_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32185,7 +32184,7 @@ def rotate_ords_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32276,7 +32275,7 @@ def rotate_pluggable_database_encryption_key(self, pluggable_database_id, **kwar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_pluggable_database_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -32285,10 +32284,10 @@ def rotate_pluggable_database_encryption_key(self, pluggable_database_id, **kwar "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32298,7 +32297,7 @@ def rotate_pluggable_database_encryption_key(self, pluggable_database_id, **kwar "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32389,7 +32388,7 @@ def rotate_ssl_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_ssl_certs got unknown kwargs: {extra_kwargs!r}") @@ -32398,10 +32397,10 @@ def rotate_ssl_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32411,7 +32410,7 @@ def rotate_ssl_certs(self, autonomous_exadata_infrastructure_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32504,7 +32503,7 @@ def rotate_vault_key(self, database_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_vault_key got unknown kwargs: {extra_kwargs!r}") @@ -32513,10 +32512,10 @@ def rotate_vault_key(self, database_id, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32526,7 +32525,7 @@ def rotate_vault_key(self, database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32605,7 +32604,7 @@ def saas_admin_user_status(self, autonomous_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"saas_admin_user_status got unknown kwargs: {extra_kwargs!r}") @@ -32614,10 +32613,10 @@ def saas_admin_user_status(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32625,7 +32624,7 @@ def saas_admin_user_status(self, autonomous_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32718,7 +32717,7 @@ def scan_external_container_database_pluggable_databases(self, external_containe "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"scan_external_container_database_pluggable_databases got unknown kwargs: {extra_kwargs!r}") @@ -32727,16 +32726,16 @@ def scan_external_container_database_pluggable_databases(self, external_containe "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "externalDatabaseConnectorId": external_database_connector_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -32744,7 +32743,7 @@ def scan_external_container_database_pluggable_databases(self, external_containe "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32825,7 +32824,7 @@ def shrink_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"shrink_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -32834,10 +32833,10 @@ def shrink_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32845,7 +32844,7 @@ def shrink_autonomous_database(self, autonomous_database_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32925,7 +32924,7 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -32934,10 +32933,10 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -32945,7 +32944,7 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33037,7 +33036,7 @@ def start_pluggable_database(self, pluggable_database_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -33046,10 +33045,10 @@ def start_pluggable_database(self, pluggable_database_id, **kwargs): "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33059,7 +33058,7 @@ def start_pluggable_database(self, pluggable_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33144,7 +33143,7 @@ def stop_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -33153,10 +33152,10 @@ def stop_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33165,7 +33164,7 @@ def stop_autonomous_database(self, autonomous_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33257,7 +33256,7 @@ def stop_pluggable_database(self, pluggable_database_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -33266,10 +33265,10 @@ def stop_pluggable_database(self, pluggable_database_id, **kwargs): "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33279,7 +33278,7 @@ def stop_pluggable_database(self, pluggable_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33367,7 +33366,7 @@ def switchover_autonomous_container_database_dataguard_association(self, autonom "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"switchover_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -33377,10 +33376,10 @@ def switchover_autonomous_container_database_dataguard_association(self, autonom "autonomousContainerDatabaseDataguardAssociationId": autonomous_container_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33388,7 +33387,7 @@ def switchover_autonomous_container_database_dataguard_association(self, autonom "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33489,7 +33488,7 @@ def switchover_autonomous_database(self, autonomous_database_id, **kwargs): "opc_request_id", "peer_db_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"switchover_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -33498,16 +33497,16 @@ def switchover_autonomous_database(self, autonomous_database_id, **kwargs): "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "peerDbId": kwargs.get("peer_db_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -33516,7 +33515,7 @@ def switchover_autonomous_database(self, autonomous_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33610,7 +33609,7 @@ def switchover_data_guard_association(self, database_id, data_guard_association_ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"switchover_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -33620,10 +33619,10 @@ def switchover_data_guard_association(self, database_id, data_guard_association_ "dataGuardAssociationId": data_guard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33631,7 +33630,7 @@ def switchover_data_guard_association(self, database_id, data_guard_association_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33713,7 +33712,7 @@ def terminate_autonomous_container_database(self, autonomous_container_database_ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -33722,10 +33721,10 @@ def terminate_autonomous_container_database(self, autonomous_container_database_ "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33733,7 +33732,7 @@ def terminate_autonomous_container_database(self, autonomous_container_database_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33811,7 +33810,7 @@ def terminate_autonomous_exadata_infrastructure(self, autonomous_exadata_infrast "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_autonomous_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -33820,10 +33819,10 @@ def terminate_autonomous_exadata_infrastructure(self, autonomous_exadata_infrast "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33831,7 +33830,7 @@ def terminate_autonomous_exadata_infrastructure(self, autonomous_exadata_infrast "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33916,7 +33915,7 @@ def terminate_db_system(self, db_system_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"terminate_db_system got unknown kwargs: {extra_kwargs!r}") @@ -33925,10 +33924,10 @@ def terminate_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -33936,7 +33935,7 @@ def terminate_db_system(self, db_system_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34017,7 +34016,7 @@ def update_autonomous_container_database(self, autonomous_container_database_id, "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -34026,10 +34025,10 @@ def update_autonomous_container_database(self, autonomous_container_database_id, "autonomousContainerDatabaseId": autonomous_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34037,7 +34036,7 @@ def update_autonomous_container_database(self, autonomous_container_database_id, "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34131,7 +34130,7 @@ def update_autonomous_container_database_dataguard_association(self, autonomous_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -34141,10 +34140,10 @@ def update_autonomous_container_database_dataguard_association(self, autonomous_ "autonomousContainerDatabaseDataguardAssociationId": autonomous_container_database_dataguard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34153,7 +34152,7 @@ def update_autonomous_container_database_dataguard_association(self, autonomous_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34242,7 +34241,7 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -34251,10 +34250,10 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34263,7 +34262,7 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34352,7 +34351,7 @@ def update_autonomous_database_backup(self, autonomous_database_backup_id, updat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -34361,10 +34360,10 @@ def update_autonomous_database_backup(self, autonomous_database_backup_id, updat "autonomousDatabaseBackupId": autonomous_database_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34373,7 +34372,7 @@ def update_autonomous_database_backup(self, autonomous_database_backup_id, updat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34451,7 +34450,7 @@ def update_autonomous_database_regional_wallet(self, update_autonomous_database_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_database_regional_wallet got unknown kwargs: {extra_kwargs!r}") @@ -34461,7 +34460,7 @@ def update_autonomous_database_regional_wallet(self, update_autonomous_database_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34546,7 +34545,7 @@ def update_autonomous_database_software_image(self, autonomous_database_software "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -34555,10 +34554,10 @@ def update_autonomous_database_software_image(self, autonomous_database_software "autonomousDatabaseSoftwareImageId": autonomous_database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34567,7 +34566,7 @@ def update_autonomous_database_software_image(self, autonomous_database_software "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34650,7 +34649,7 @@ def update_autonomous_database_wallet(self, autonomous_database_id, update_auton "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -34659,10 +34658,10 @@ def update_autonomous_database_wallet(self, autonomous_database_id, update_auton "autonomousDatabaseId": autonomous_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34670,7 +34669,7 @@ def update_autonomous_database_wallet(self, autonomous_database_id, update_auton "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34753,7 +34752,7 @@ def update_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastruc "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -34762,10 +34761,10 @@ def update_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastruc "autonomousExadataInfrastructureId": autonomous_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34773,7 +34772,7 @@ def update_autonomous_exadata_infrastructure(self, autonomous_exadata_infrastruc "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34862,7 +34861,7 @@ def update_autonomous_vm_cluster(self, autonomous_vm_cluster_id, update_autonomo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -34871,10 +34870,10 @@ def update_autonomous_vm_cluster(self, autonomous_vm_cluster_id, update_autonomo "autonomousVmClusterId": autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34883,7 +34882,7 @@ def update_autonomous_vm_cluster(self, autonomous_vm_cluster_id, update_autonomo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34975,7 +34974,7 @@ def update_backup_destination(self, backup_destination_id, update_backup_destina "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backup_destination got unknown kwargs: {extra_kwargs!r}") @@ -34984,10 +34983,10 @@ def update_backup_destination(self, backup_destination_id, update_backup_destina "backupDestinationId": backup_destination_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -34996,7 +34995,7 @@ def update_backup_destination(self, backup_destination_id, update_backup_destina "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35085,7 +35084,7 @@ def update_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -35094,10 +35093,10 @@ def update_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, upd "cloudAutonomousVmClusterId": cloud_autonomous_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35106,7 +35105,7 @@ def update_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35195,7 +35194,7 @@ def update_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -35204,10 +35203,10 @@ def update_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, u "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35216,7 +35215,7 @@ def update_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35305,7 +35304,7 @@ def update_cloud_vm_cluster(self, cloud_vm_cluster_id, update_cloud_vm_cluster_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -35314,10 +35313,10 @@ def update_cloud_vm_cluster(self, cloud_vm_cluster_id, update_cloud_vm_cluster_d "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35326,7 +35325,7 @@ def update_cloud_vm_cluster(self, cloud_vm_cluster_id, update_cloud_vm_cluster_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35415,7 +35414,7 @@ def update_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, cloud_vm_clus "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cloud_vm_cluster_iorm_config got unknown kwargs: {extra_kwargs!r}") @@ -35424,10 +35423,10 @@ def update_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, cloud_vm_clus "cloudVmClusterId": cloud_vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35436,7 +35435,7 @@ def update_cloud_vm_cluster_iorm_config(self, cloud_vm_cluster_id, cloud_vm_clus "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35528,7 +35527,7 @@ def update_console_connection(self, db_node_id, console_connection_id, update_co "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_console_connection got unknown kwargs: {extra_kwargs!r}") @@ -35538,10 +35537,10 @@ def update_console_connection(self, db_node_id, console_connection_id, update_co "consoleConnectionId": console_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35550,7 +35549,7 @@ def update_console_connection(self, db_node_id, console_connection_id, update_co "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35642,7 +35641,7 @@ def update_console_history(self, db_node_id, console_history_id, update_console_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_console_history got unknown kwargs: {extra_kwargs!r}") @@ -35652,10 +35651,10 @@ def update_console_history(self, db_node_id, console_history_id, update_console_ "consoleHistoryId": console_history_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35664,7 +35663,7 @@ def update_console_history(self, db_node_id, console_history_id, update_console_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35758,7 +35757,7 @@ def update_data_guard_association(self, database_id, data_guard_association_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_guard_association got unknown kwargs: {extra_kwargs!r}") @@ -35768,10 +35767,10 @@ def update_data_guard_association(self, database_id, data_guard_association_id, "dataGuardAssociationId": data_guard_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35780,7 +35779,7 @@ def update_data_guard_association(self, database_id, data_guard_association_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35865,7 +35864,7 @@ def update_database(self, database_id, update_database_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database got unknown kwargs: {extra_kwargs!r}") @@ -35874,10 +35873,10 @@ def update_database(self, database_id, update_database_details, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35885,7 +35884,7 @@ def update_database(self, database_id, update_database_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35970,7 +35969,7 @@ def update_database_software_image(self, database_software_image_id, update_data "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_software_image got unknown kwargs: {extra_kwargs!r}") @@ -35979,10 +35978,10 @@ def update_database_software_image(self, database_software_image_id, update_data "databaseSoftwareImageId": database_software_image_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35990,7 +35989,7 @@ def update_database_software_image(self, database_software_image_id, update_data "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36075,7 +36074,7 @@ def update_db_home(self, db_home_id, update_db_home_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_home got unknown kwargs: {extra_kwargs!r}") @@ -36084,10 +36083,10 @@ def update_db_home(self, db_home_id, update_db_home_details, **kwargs): "dbHomeId": db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36095,7 +36094,7 @@ def update_db_home(self, db_home_id, update_db_home_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36184,7 +36183,7 @@ def update_db_node(self, db_node_id, update_db_node_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_node got unknown kwargs: {extra_kwargs!r}") @@ -36193,10 +36192,10 @@ def update_db_node(self, db_node_id, update_db_node_details, **kwargs): "dbNodeId": db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36205,7 +36204,7 @@ def update_db_node(self, db_node_id, update_db_node_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36297,7 +36296,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_system got unknown kwargs: {extra_kwargs!r}") @@ -36306,10 +36305,10 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36317,7 +36316,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36407,7 +36406,7 @@ def update_exadata_infrastructure(self, exadata_infrastructure_id, update_exadat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -36416,10 +36415,10 @@ def update_exadata_infrastructure(self, exadata_infrastructure_id, update_exadat "exadataInfrastructureId": exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36428,7 +36427,7 @@ def update_exadata_infrastructure(self, exadata_infrastructure_id, update_exadat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36527,7 +36526,7 @@ def update_exadata_iorm_config(self, db_system_id, exadata_iorm_config_update_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_exadata_iorm_config got unknown kwargs: {extra_kwargs!r}") @@ -36536,10 +36535,10 @@ def update_exadata_iorm_config(self, db_system_id, exadata_iorm_config_update_de "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36548,7 +36547,7 @@ def update_exadata_iorm_config(self, db_system_id, exadata_iorm_config_update_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36640,7 +36639,7 @@ def update_external_container_database(self, external_container_database_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_container_database got unknown kwargs: {extra_kwargs!r}") @@ -36649,10 +36648,10 @@ def update_external_container_database(self, external_container_database_id, upd "externalContainerDatabaseId": external_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36661,7 +36660,7 @@ def update_external_container_database(self, external_container_database_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36751,7 +36750,7 @@ def update_external_database_connector(self, external_database_connector_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -36760,10 +36759,10 @@ def update_external_database_connector(self, external_database_connector_id, upd "externalDatabaseConnectorId": external_database_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36772,7 +36771,7 @@ def update_external_database_connector(self, external_database_connector_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36861,7 +36860,7 @@ def update_external_non_container_database(self, external_non_container_database "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_non_container_database got unknown kwargs: {extra_kwargs!r}") @@ -36870,10 +36869,10 @@ def update_external_non_container_database(self, external_non_container_database "externalNonContainerDatabaseId": external_non_container_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36882,7 +36881,7 @@ def update_external_non_container_database(self, external_non_container_database "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36973,7 +36972,7 @@ def update_external_pluggable_database(self, external_pluggable_database_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -36982,10 +36981,10 @@ def update_external_pluggable_database(self, external_pluggable_database_id, upd "externalPluggableDatabaseId": external_pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36994,7 +36993,7 @@ def update_external_pluggable_database(self, external_pluggable_database_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37083,7 +37082,7 @@ def update_key_store(self, key_store_id, update_key_store_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_key_store got unknown kwargs: {extra_kwargs!r}") @@ -37092,10 +37091,10 @@ def update_key_store(self, key_store_id, update_key_store_details, **kwargs): "keyStoreId": key_store_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37104,7 +37103,7 @@ def update_key_store(self, key_store_id, update_key_store_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37187,7 +37186,7 @@ def update_maintenance_run(self, maintenance_run_id, update_maintenance_run_deta "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_maintenance_run got unknown kwargs: {extra_kwargs!r}") @@ -37196,10 +37195,10 @@ def update_maintenance_run(self, maintenance_run_id, update_maintenance_run_deta "maintenanceRunId": maintenance_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37207,7 +37206,7 @@ def update_maintenance_run(self, maintenance_run_id, update_maintenance_run_deta "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37296,7 +37295,7 @@ def update_oneoff_patch(self, oneoff_patch_id, update_oneoff_patch_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oneoff_patch got unknown kwargs: {extra_kwargs!r}") @@ -37305,10 +37304,10 @@ def update_oneoff_patch(self, oneoff_patch_id, update_oneoff_patch_details, **kw "oneoffPatchId": oneoff_patch_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37317,7 +37316,7 @@ def update_oneoff_patch(self, oneoff_patch_id, update_oneoff_patch_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37402,7 +37401,7 @@ def update_pluggable_database(self, pluggable_database_id, update_pluggable_data "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pluggable_database got unknown kwargs: {extra_kwargs!r}") @@ -37411,10 +37410,10 @@ def update_pluggable_database(self, pluggable_database_id, update_pluggable_data "pluggableDatabaseId": pluggable_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37422,7 +37421,7 @@ def update_pluggable_database(self, pluggable_database_id, update_pluggable_data "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37511,7 +37510,7 @@ def update_vm_cluster(self, vm_cluster_id, update_vm_cluster_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -37520,10 +37519,10 @@ def update_vm_cluster(self, vm_cluster_id, update_vm_cluster_details, **kwargs): "vmClusterId": vm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37532,7 +37531,7 @@ def update_vm_cluster(self, vm_cluster_id, update_vm_cluster_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37627,7 +37626,7 @@ def update_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -37637,10 +37636,10 @@ def update_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37649,7 +37648,7 @@ def update_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_networ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37738,7 +37737,7 @@ def upgrade_database(self, database_id, upgrade_database_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_database got unknown kwargs: {extra_kwargs!r}") @@ -37747,10 +37746,10 @@ def upgrade_database(self, database_id, upgrade_database_details, **kwargs): "databaseId": database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37759,7 +37758,7 @@ def upgrade_database(self, database_id, upgrade_database_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37856,7 +37855,7 @@ def upgrade_db_system(self, db_system_id, upgrade_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_db_system got unknown kwargs: {extra_kwargs!r}") @@ -37865,10 +37864,10 @@ def upgrade_db_system(self, db_system_id, upgrade_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37878,7 +37877,7 @@ def upgrade_db_system(self, db_system_id, upgrade_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37972,7 +37971,7 @@ def validate_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_netw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_vm_cluster_network got unknown kwargs: {extra_kwargs!r}") @@ -37982,10 +37981,10 @@ def validate_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_netw "vmClusterNetworkId": vm_cluster_network_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -37994,7 +37993,7 @@ def validate_vm_cluster_network(self, exadata_infrastructure_id, vm_cluster_netw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_management/db_management_client.py b/src/oci/database_management/db_management_client.py index c2c63b94af..5fc4e47ed3 100644 --- a/src/oci/database_management/db_management_client.py +++ b/src/oci/database_management/db_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -176,7 +175,7 @@ def add_data_files(self, managed_database_id, tablespace_name, add_data_files_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_data_files got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def add_data_files(self, managed_database_id, tablespace_name, add_data_files_de "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -198,7 +197,7 @@ def add_data_files(self, managed_database_id, tablespace_name, add_data_files_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -292,7 +291,7 @@ def add_managed_database_to_managed_database_group(self, managed_database_group_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_managed_database_to_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -301,10 +300,10 @@ def add_managed_database_to_managed_database_group(self, managed_database_group_ "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -313,7 +312,7 @@ def add_managed_database_to_managed_database_group(self, managed_database_group_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -424,7 +423,7 @@ def addm_tasks(self, managed_database_id, time_start, time_end, **kwargs): "sort_order", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"addm_tasks got unknown kwargs: {extra_kwargs!r}") @@ -433,10 +432,10 @@ def addm_tasks(self, managed_database_id, time_start, time_end, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -461,7 +460,7 @@ def addm_tasks(self, managed_database_id, time_start, time_end, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -469,7 +468,7 @@ def addm_tasks(self, managed_database_id, time_start, time_end, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -572,7 +571,7 @@ def change_database_parameters(self, managed_database_id, change_database_parame "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_parameters got unknown kwargs: {extra_kwargs!r}") @@ -581,10 +580,10 @@ def change_database_parameters(self, managed_database_id, change_database_parame "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -593,7 +592,7 @@ def change_database_parameters(self, managed_database_id, change_database_parame "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -693,7 +692,7 @@ def change_db_management_private_endpoint_compartment(self, db_management_privat "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_db_management_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -702,10 +701,10 @@ def change_db_management_private_endpoint_compartment(self, db_management_privat "dbManagementPrivateEndpointId": db_management_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -715,7 +714,7 @@ def change_db_management_private_endpoint_compartment(self, db_management_privat "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -815,7 +814,7 @@ def change_external_db_system_compartment(self, external_db_system_id, change_ex "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_external_db_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -824,10 +823,10 @@ def change_external_db_system_compartment(self, external_db_system_id, change_ex "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -837,7 +836,7 @@ def change_external_db_system_compartment(self, external_db_system_id, change_ex "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -937,7 +936,7 @@ def change_external_exadata_infrastructure_compartment(self, external_exadata_in "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_external_exadata_infrastructure_compartment got unknown kwargs: {extra_kwargs!r}") @@ -946,10 +945,10 @@ def change_external_exadata_infrastructure_compartment(self, external_exadata_in "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -959,7 +958,7 @@ def change_external_exadata_infrastructure_compartment(self, external_exadata_in "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1059,7 +1058,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1068,10 +1067,10 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1081,7 +1080,7 @@ def change_job_compartment(self, job_id, change_job_compartment_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1183,7 +1182,7 @@ def change_managed_database_group_compartment(self, managed_database_group_id, c "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_managed_database_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1192,10 +1191,10 @@ def change_managed_database_group_compartment(self, managed_database_group_id, c "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1205,7 +1204,7 @@ def change_managed_database_group_compartment(self, managed_database_group_id, c "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1307,7 +1306,7 @@ def change_named_credential_compartment(self, named_credential_id, change_named_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_named_credential_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1316,10 +1315,10 @@ def change_named_credential_compartment(self, named_credential_id, change_named_ "namedCredentialId": named_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1329,7 +1328,7 @@ def change_named_credential_compartment(self, named_credential_id, change_named_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1415,7 +1414,7 @@ def change_plan_retention(self, managed_database_id, change_plan_retention_detai "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_plan_retention got unknown kwargs: {extra_kwargs!r}") @@ -1424,10 +1423,10 @@ def change_plan_retention(self, managed_database_id, change_plan_retention_detai "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1435,7 +1434,7 @@ def change_plan_retention(self, managed_database_id, change_plan_retention_detai "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1517,7 +1516,7 @@ def change_space_budget(self, managed_database_id, change_space_budget_details, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_space_budget got unknown kwargs: {extra_kwargs!r}") @@ -1526,10 +1525,10 @@ def change_space_budget(self, managed_database_id, change_space_budget_details, "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1537,7 +1536,7 @@ def change_space_budget(self, managed_database_id, change_space_budget_details, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1618,7 +1617,7 @@ def change_sql_plan_baselines_attributes(self, managed_database_id, change_sql_p "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sql_plan_baselines_attributes got unknown kwargs: {extra_kwargs!r}") @@ -1627,10 +1626,10 @@ def change_sql_plan_baselines_attributes(self, managed_database_id, change_sql_p "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1638,7 +1637,7 @@ def change_sql_plan_baselines_attributes(self, managed_database_id, change_sql_p "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1733,7 +1732,7 @@ def check_external_db_system_connector_connection_status(self, external_db_syste "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"check_external_db_system_connector_connection_status got unknown kwargs: {extra_kwargs!r}") @@ -1742,10 +1741,10 @@ def check_external_db_system_connector_connection_status(self, external_db_syste "externalDbSystemConnectorId": external_db_system_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1755,7 +1754,7 @@ def check_external_db_system_connector_connection_status(self, external_db_syste "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1852,7 +1851,7 @@ def check_external_exadata_storage_connector(self, external_exadata_storage_conn "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"check_external_exadata_storage_connector got unknown kwargs: {extra_kwargs!r}") @@ -1861,10 +1860,10 @@ def check_external_exadata_storage_connector(self, external_exadata_storage_conn "externalExadataStorageConnectorId": external_exadata_storage_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1874,7 +1873,7 @@ def check_external_exadata_storage_connector(self, external_exadata_storage_conn "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1959,7 +1958,7 @@ def configure_automatic_capture_filters(self, managed_database_id, configure_aut "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_automatic_capture_filters got unknown kwargs: {extra_kwargs!r}") @@ -1968,10 +1967,10 @@ def configure_automatic_capture_filters(self, managed_database_id, configure_aut "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1979,7 +1978,7 @@ def configure_automatic_capture_filters(self, managed_database_id, configure_aut "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2062,7 +2061,7 @@ def configure_automatic_spm_evolve_advisor_task(self, managed_database_id, confi "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_automatic_spm_evolve_advisor_task got unknown kwargs: {extra_kwargs!r}") @@ -2071,10 +2070,10 @@ def configure_automatic_spm_evolve_advisor_task(self, managed_database_id, confi "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2082,7 +2081,7 @@ def configure_automatic_spm_evolve_advisor_task(self, managed_database_id, confi "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2166,7 +2165,7 @@ def create_db_management_private_endpoint(self, create_db_management_private_end "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_db_management_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2177,7 +2176,7 @@ def create_db_management_private_endpoint(self, create_db_management_private_end "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2262,7 +2261,7 @@ def create_external_db_system(self, create_external_db_system_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_db_system got unknown kwargs: {extra_kwargs!r}") @@ -2273,7 +2272,7 @@ def create_external_db_system(self, create_external_db_system_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2360,7 +2359,7 @@ def create_external_db_system_connector(self, create_external_db_system_connecto "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -2371,7 +2370,7 @@ def create_external_db_system_connector(self, create_external_db_system_connecto "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2458,7 +2457,7 @@ def create_external_db_system_discovery(self, create_external_db_system_discover "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -2469,7 +2468,7 @@ def create_external_db_system_discovery(self, create_external_db_system_discover "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2561,7 +2560,7 @@ def create_external_exadata_infrastructure(self, create_external_exadata_infrast "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -2572,7 +2571,7 @@ def create_external_exadata_infrastructure(self, create_external_exadata_infrast "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2659,7 +2658,7 @@ def create_external_exadata_storage_connector(self, create_external_exadata_stor "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_external_exadata_storage_connector got unknown kwargs: {extra_kwargs!r}") @@ -2670,7 +2669,7 @@ def create_external_exadata_storage_connector(self, create_external_exadata_stor "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2759,7 +2758,7 @@ def create_job(self, create_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job got unknown kwargs: {extra_kwargs!r}") @@ -2770,7 +2769,7 @@ def create_job(self, create_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2856,7 +2855,7 @@ def create_managed_database_group(self, create_managed_database_group_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -2867,7 +2866,7 @@ def create_managed_database_group(self, create_managed_database_group_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2952,7 +2951,7 @@ def create_named_credential(self, create_named_credential_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -2963,7 +2962,7 @@ def create_named_credential(self, create_named_credential_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3053,7 +3052,7 @@ def create_tablespace(self, managed_database_id, create_tablespace_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tablespace got unknown kwargs: {extra_kwargs!r}") @@ -3062,10 +3061,10 @@ def create_tablespace(self, managed_database_id, create_tablespace_details, **kw "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3074,7 +3073,7 @@ def create_tablespace(self, managed_database_id, create_tablespace_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3163,7 +3162,7 @@ def delete_db_management_private_endpoint(self, db_management_private_endpoint_i "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_db_management_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3172,10 +3171,10 @@ def delete_db_management_private_endpoint(self, db_management_private_endpoint_i "dbManagementPrivateEndpointId": db_management_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3184,7 +3183,7 @@ def delete_db_management_private_endpoint(self, db_management_private_endpoint_i "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3268,7 +3267,7 @@ def delete_external_db_system(self, external_db_system_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3277,10 +3276,10 @@ def delete_external_db_system(self, external_db_system_id, **kwargs): "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3289,7 +3288,7 @@ def delete_external_db_system(self, external_db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3373,7 +3372,7 @@ def delete_external_db_system_connector(self, external_db_system_connector_id, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -3382,10 +3381,10 @@ def delete_external_db_system_connector(self, external_db_system_connector_id, * "externalDbSystemConnectorId": external_db_system_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3394,7 +3393,7 @@ def delete_external_db_system_connector(self, external_db_system_connector_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3478,7 +3477,7 @@ def delete_external_db_system_discovery(self, external_db_system_discovery_id, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -3487,10 +3486,10 @@ def delete_external_db_system_discovery(self, external_db_system_discovery_id, * "externalDbSystemDiscoveryId": external_db_system_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3499,7 +3498,7 @@ def delete_external_db_system_discovery(self, external_db_system_discovery_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3583,7 +3582,7 @@ def delete_external_exadata_infrastructure(self, external_exadata_infrastructure "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -3592,10 +3591,10 @@ def delete_external_exadata_infrastructure(self, external_exadata_infrastructure "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3604,7 +3603,7 @@ def delete_external_exadata_infrastructure(self, external_exadata_infrastructure "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3688,7 +3687,7 @@ def delete_external_exadata_storage_connector(self, external_exadata_storage_con "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_external_exadata_storage_connector got unknown kwargs: {extra_kwargs!r}") @@ -3697,10 +3696,10 @@ def delete_external_exadata_storage_connector(self, external_exadata_storage_con "externalExadataStorageConnectorId": external_exadata_storage_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3709,7 +3708,7 @@ def delete_external_exadata_storage_connector(self, external_exadata_storage_con "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3791,7 +3790,7 @@ def delete_job(self, job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job got unknown kwargs: {extra_kwargs!r}") @@ -3800,10 +3799,10 @@ def delete_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3812,7 +3811,7 @@ def delete_job(self, job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3897,7 +3896,7 @@ def delete_managed_database_group(self, managed_database_group_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -3906,10 +3905,10 @@ def delete_managed_database_group(self, managed_database_group_id, **kwargs): "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3918,7 +3917,7 @@ def delete_managed_database_group(self, managed_database_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4002,7 +4001,7 @@ def delete_named_credential(self, named_credential_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -4011,10 +4010,10 @@ def delete_named_credential(self, named_credential_id, **kwargs): "namedCredentialId": named_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4023,7 +4022,7 @@ def delete_named_credential(self, named_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4102,7 +4101,7 @@ def delete_preferred_credential(self, managed_database_id, credential_name, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_preferred_credential got unknown kwargs: {extra_kwargs!r}") @@ -4112,10 +4111,10 @@ def delete_preferred_credential(self, managed_database_id, credential_name, **kw "credentialName": credential_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4123,7 +4122,7 @@ def delete_preferred_credential(self, managed_database_id, credential_name, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4202,7 +4201,7 @@ def disable_automatic_initial_plan_capture(self, managed_database_id, disable_au "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_automatic_initial_plan_capture got unknown kwargs: {extra_kwargs!r}") @@ -4211,10 +4210,10 @@ def disable_automatic_initial_plan_capture(self, managed_database_id, disable_au "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4222,7 +4221,7 @@ def disable_automatic_initial_plan_capture(self, managed_database_id, disable_au "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4306,7 +4305,7 @@ def disable_automatic_spm_evolve_advisor_task(self, managed_database_id, disable "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_automatic_spm_evolve_advisor_task got unknown kwargs: {extra_kwargs!r}") @@ -4315,10 +4314,10 @@ def disable_automatic_spm_evolve_advisor_task(self, managed_database_id, disable "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4326,7 +4325,7 @@ def disable_automatic_spm_evolve_advisor_task(self, managed_database_id, disable "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4421,7 +4420,7 @@ def disable_external_db_system_database_management(self, external_db_system_id, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_db_system_database_management got unknown kwargs: {extra_kwargs!r}") @@ -4430,10 +4429,10 @@ def disable_external_db_system_database_management(self, external_db_system_id, "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4443,7 +4442,7 @@ def disable_external_db_system_database_management(self, external_db_system_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4539,7 +4538,7 @@ def disable_external_db_system_stack_monitoring(self, external_db_system_id, **k "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_db_system_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -4548,10 +4547,10 @@ def disable_external_db_system_stack_monitoring(self, external_db_system_id, **k "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4561,7 +4560,7 @@ def disable_external_db_system_stack_monitoring(self, external_db_system_id, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4663,7 +4662,7 @@ def disable_external_exadata_infrastructure_management(self, external_exadata_in "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_exadata_infrastructure_management got unknown kwargs: {extra_kwargs!r}") @@ -4672,10 +4671,10 @@ def disable_external_exadata_infrastructure_management(self, external_exadata_in "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4685,7 +4684,7 @@ def disable_external_exadata_infrastructure_management(self, external_exadata_in "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4770,7 +4769,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_datab "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_high_frequency_automatic_spm_evolve_advisor_task got unknown kwargs: {extra_kwargs!r}") @@ -4779,10 +4778,10 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_datab "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4790,7 +4789,7 @@ def disable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_datab "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4873,7 +4872,7 @@ def disable_sql_plan_baselines_usage(self, managed_database_id, disable_sql_plan "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_sql_plan_baselines_usage got unknown kwargs: {extra_kwargs!r}") @@ -4882,10 +4881,10 @@ def disable_sql_plan_baselines_usage(self, managed_database_id, disable_sql_plan "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4893,7 +4892,7 @@ def disable_sql_plan_baselines_usage(self, managed_database_id, disable_sql_plan "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5003,7 +5002,7 @@ def discover_external_exadata_infrastructure(self, discover_external_exadata_inf "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"discover_external_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -5015,7 +5014,7 @@ def discover_external_exadata_infrastructure(self, discover_external_exadata_inf "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5099,7 +5098,7 @@ def drop_sql_plan_baselines(self, managed_database_id, drop_sql_plan_baselines_d "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"drop_sql_plan_baselines got unknown kwargs: {extra_kwargs!r}") @@ -5108,10 +5107,10 @@ def drop_sql_plan_baselines(self, managed_database_id, drop_sql_plan_baselines_d "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5119,7 +5118,7 @@ def drop_sql_plan_baselines(self, managed_database_id, drop_sql_plan_baselines_d "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5211,7 +5210,7 @@ def drop_tablespace(self, managed_database_id, tablespace_name, drop_tablespace_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"drop_tablespace got unknown kwargs: {extra_kwargs!r}") @@ -5221,10 +5220,10 @@ def drop_tablespace(self, managed_database_id, tablespace_name, drop_tablespace_ "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5233,7 +5232,7 @@ def drop_tablespace(self, managed_database_id, tablespace_name, drop_tablespace_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5324,7 +5323,7 @@ def enable_automatic_initial_plan_capture(self, managed_database_id, enable_auto "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_automatic_initial_plan_capture got unknown kwargs: {extra_kwargs!r}") @@ -5333,10 +5332,10 @@ def enable_automatic_initial_plan_capture(self, managed_database_id, enable_auto "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5344,7 +5343,7 @@ def enable_automatic_initial_plan_capture(self, managed_database_id, enable_auto "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5437,7 +5436,7 @@ def enable_automatic_spm_evolve_advisor_task(self, managed_database_id, enable_a "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_automatic_spm_evolve_advisor_task got unknown kwargs: {extra_kwargs!r}") @@ -5446,10 +5445,10 @@ def enable_automatic_spm_evolve_advisor_task(self, managed_database_id, enable_a "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5457,7 +5456,7 @@ def enable_automatic_spm_evolve_advisor_task(self, managed_database_id, enable_a "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5555,7 +5554,7 @@ def enable_external_db_system_database_management(self, external_db_system_id, e "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_db_system_database_management got unknown kwargs: {extra_kwargs!r}") @@ -5564,10 +5563,10 @@ def enable_external_db_system_database_management(self, external_db_system_id, e "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5577,7 +5576,7 @@ def enable_external_db_system_database_management(self, external_db_system_id, e "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5678,7 +5677,7 @@ def enable_external_db_system_stack_monitoring(self, external_db_system_id, enab "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_db_system_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -5687,10 +5686,10 @@ def enable_external_db_system_stack_monitoring(self, external_db_system_id, enab "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5700,7 +5699,7 @@ def enable_external_db_system_stack_monitoring(self, external_db_system_id, enab "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5805,7 +5804,7 @@ def enable_external_exadata_infrastructure_management(self, external_exadata_inf "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_external_exadata_infrastructure_management got unknown kwargs: {extra_kwargs!r}") @@ -5814,10 +5813,10 @@ def enable_external_exadata_infrastructure_management(self, external_exadata_inf "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5827,7 +5826,7 @@ def enable_external_exadata_infrastructure_management(self, external_exadata_inf "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5919,7 +5918,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_databa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_high_frequency_automatic_spm_evolve_advisor_task got unknown kwargs: {extra_kwargs!r}") @@ -5928,10 +5927,10 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_databa "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5939,7 +5938,7 @@ def enable_high_frequency_automatic_spm_evolve_advisor_task(self, managed_databa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6023,7 +6022,7 @@ def enable_sql_plan_baselines_usage(self, managed_database_id, enable_sql_plan_b "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_sql_plan_baselines_usage got unknown kwargs: {extra_kwargs!r}") @@ -6032,10 +6031,10 @@ def enable_sql_plan_baselines_usage(self, managed_database_id, enable_sql_plan_b "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6043,7 +6042,7 @@ def enable_sql_plan_baselines_usage(self, managed_database_id, enable_sql_plan_b "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6133,7 +6132,7 @@ def generate_awr_snapshot(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_awr_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -6142,10 +6141,10 @@ def generate_awr_snapshot(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6155,7 +6154,7 @@ def generate_awr_snapshot(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6289,7 +6288,7 @@ def get_awr_db_report(self, managed_database_id, awr_db_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_db_report got unknown kwargs: {extra_kwargs!r}") @@ -6299,10 +6298,10 @@ def get_awr_db_report(self, managed_database_id, awr_db_id, **kwargs): "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'report_type' in kwargs: @@ -6329,7 +6328,7 @@ def get_awr_db_report(self, managed_database_id, awr_db_id, **kwargs): "containerId": kwargs.get("container_id", missing), "reportFormat": kwargs.get("report_format", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6338,7 +6337,7 @@ def get_awr_db_report(self, managed_database_id, awr_db_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6471,7 +6470,7 @@ def get_awr_db_sql_report(self, managed_database_id, awr_db_id, sql_id, **kwargs "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_db_sql_report got unknown kwargs: {extra_kwargs!r}") @@ -6481,10 +6480,10 @@ def get_awr_db_sql_report(self, managed_database_id, awr_db_id, sql_id, **kwargs "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'report_format' in kwargs: @@ -6504,7 +6503,7 @@ def get_awr_db_sql_report(self, managed_database_id, awr_db_id, sql_id, **kwargs "reportFormat": kwargs.get("report_format", missing), "containerId": kwargs.get("container_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6513,7 +6512,7 @@ def get_awr_db_sql_report(self, managed_database_id, awr_db_id, sql_id, **kwargs "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6604,7 +6603,7 @@ def get_cluster_cache_metric(self, managed_database_id, start_time, end_time, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster_cache_metric got unknown kwargs: {extra_kwargs!r}") @@ -6613,24 +6612,24 @@ def get_cluster_cache_metric(self, managed_database_id, start_time, end_time, ** "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "startTime": start_time, "endTime": end_time } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6802,7 +6801,7 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe "defined_tag_exists", "freeform_tag_exists" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_fleet_health_metrics got unknown kwargs: {extra_kwargs!r}") @@ -6848,14 +6847,14 @@ def get_database_fleet_health_metrics(self, compare_baseline_time, compare_targe "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6941,7 +6940,7 @@ def get_database_home_metrics(self, managed_database_id, start_time, end_time, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_home_metrics got unknown kwargs: {extra_kwargs!r}") @@ -6951,14 +6950,14 @@ def get_database_home_metrics(self, managed_database_id, start_time, end_time, * "startTime": start_time, "endTime": end_time } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7036,7 +7035,7 @@ def get_db_management_private_endpoint(self, db_management_private_endpoint_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_management_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -7045,10 +7044,10 @@ def get_db_management_private_endpoint(self, db_management_private_endpoint_id, "dbManagementPrivateEndpointId": db_management_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7056,7 +7055,7 @@ def get_db_management_private_endpoint(self, db_management_private_endpoint_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7134,7 +7133,7 @@ def get_external_asm(self, external_asm_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_asm got unknown kwargs: {extra_kwargs!r}") @@ -7143,10 +7142,10 @@ def get_external_asm(self, external_asm_id, **kwargs): "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7154,7 +7153,7 @@ def get_external_asm(self, external_asm_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7238,7 +7237,7 @@ def get_external_asm_configuration(self, external_asm_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_asm_configuration got unknown kwargs: {extra_kwargs!r}") @@ -7247,10 +7246,10 @@ def get_external_asm_configuration(self, external_asm_id, **kwargs): "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7259,7 +7258,7 @@ def get_external_asm_configuration(self, external_asm_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7339,7 +7338,7 @@ def get_external_asm_instance(self, external_asm_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_asm_instance got unknown kwargs: {extra_kwargs!r}") @@ -7348,10 +7347,10 @@ def get_external_asm_instance(self, external_asm_instance_id, **kwargs): "externalAsmInstanceId": external_asm_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7359,7 +7358,7 @@ def get_external_asm_instance(self, external_asm_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7439,7 +7438,7 @@ def get_external_cluster(self, external_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_cluster got unknown kwargs: {extra_kwargs!r}") @@ -7448,10 +7447,10 @@ def get_external_cluster(self, external_cluster_id, **kwargs): "externalClusterId": external_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7459,7 +7458,7 @@ def get_external_cluster(self, external_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7539,7 +7538,7 @@ def get_external_cluster_instance(self, external_cluster_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_cluster_instance got unknown kwargs: {extra_kwargs!r}") @@ -7548,10 +7547,10 @@ def get_external_cluster_instance(self, external_cluster_instance_id, **kwargs): "externalClusterInstanceId": external_cluster_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7559,7 +7558,7 @@ def get_external_cluster_instance(self, external_cluster_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7639,7 +7638,7 @@ def get_external_db_home(self, external_db_home_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_db_home got unknown kwargs: {extra_kwargs!r}") @@ -7648,10 +7647,10 @@ def get_external_db_home(self, external_db_home_id, **kwargs): "externalDbHomeId": external_db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7659,7 +7658,7 @@ def get_external_db_home(self, external_db_home_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7739,7 +7738,7 @@ def get_external_db_node(self, external_db_node_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_db_node got unknown kwargs: {extra_kwargs!r}") @@ -7748,10 +7747,10 @@ def get_external_db_node(self, external_db_node_id, **kwargs): "externalDbNodeId": external_db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7759,7 +7758,7 @@ def get_external_db_node(self, external_db_node_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7839,7 +7838,7 @@ def get_external_db_system(self, external_db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_db_system got unknown kwargs: {extra_kwargs!r}") @@ -7848,10 +7847,10 @@ def get_external_db_system(self, external_db_system_id, **kwargs): "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7859,7 +7858,7 @@ def get_external_db_system(self, external_db_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7939,7 +7938,7 @@ def get_external_db_system_connector(self, external_db_system_connector_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -7948,10 +7947,10 @@ def get_external_db_system_connector(self, external_db_system_connector_id, **kw "externalDbSystemConnectorId": external_db_system_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7959,7 +7958,7 @@ def get_external_db_system_connector(self, external_db_system_connector_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8039,7 +8038,7 @@ def get_external_db_system_discovery(self, external_db_system_discovery_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -8048,10 +8047,10 @@ def get_external_db_system_discovery(self, external_db_system_discovery_id, **kw "externalDbSystemDiscoveryId": external_db_system_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8059,7 +8058,7 @@ def get_external_db_system_discovery(self, external_db_system_discovery_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8140,7 +8139,7 @@ def get_external_exadata_infrastructure(self, external_exadata_infrastructure_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -8149,10 +8148,10 @@ def get_external_exadata_infrastructure(self, external_exadata_infrastructure_id "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8160,7 +8159,7 @@ def get_external_exadata_infrastructure(self, external_exadata_infrastructure_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8240,7 +8239,7 @@ def get_external_exadata_storage_connector(self, external_exadata_storage_connec "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_exadata_storage_connector got unknown kwargs: {extra_kwargs!r}") @@ -8249,10 +8248,10 @@ def get_external_exadata_storage_connector(self, external_exadata_storage_connec "externalExadataStorageConnectorId": external_exadata_storage_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8260,7 +8259,7 @@ def get_external_exadata_storage_connector(self, external_exadata_storage_connec "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8340,7 +8339,7 @@ def get_external_exadata_storage_grid(self, external_exadata_storage_grid_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_exadata_storage_grid got unknown kwargs: {extra_kwargs!r}") @@ -8349,10 +8348,10 @@ def get_external_exadata_storage_grid(self, external_exadata_storage_grid_id, ** "externalExadataStorageGridId": external_exadata_storage_grid_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8360,7 +8359,7 @@ def get_external_exadata_storage_grid(self, external_exadata_storage_grid_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8440,7 +8439,7 @@ def get_external_exadata_storage_server(self, external_exadata_storage_server_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_exadata_storage_server got unknown kwargs: {extra_kwargs!r}") @@ -8449,10 +8448,10 @@ def get_external_exadata_storage_server(self, external_exadata_storage_server_id "externalExadataStorageServerId": external_exadata_storage_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8460,7 +8459,7 @@ def get_external_exadata_storage_server(self, external_exadata_storage_server_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8540,7 +8539,7 @@ def get_external_listener(self, external_listener_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_external_listener got unknown kwargs: {extra_kwargs!r}") @@ -8549,10 +8548,10 @@ def get_external_listener(self, external_listener_id, **kwargs): "externalListenerId": external_listener_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8560,7 +8559,7 @@ def get_external_listener(self, external_listener_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8640,7 +8639,7 @@ def get_iorm_plan(self, external_exadata_storage_server_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_iorm_plan got unknown kwargs: {extra_kwargs!r}") @@ -8649,10 +8648,10 @@ def get_iorm_plan(self, external_exadata_storage_server_id, **kwargs): "externalExadataStorageServerId": external_exadata_storage_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8660,7 +8659,7 @@ def get_iorm_plan(self, external_exadata_storage_server_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8738,7 +8737,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -8747,10 +8746,10 @@ def get_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8758,7 +8757,7 @@ def get_job(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8834,7 +8833,7 @@ def get_job_execution(self, job_execution_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_execution got unknown kwargs: {extra_kwargs!r}") @@ -8843,10 +8842,10 @@ def get_job_execution(self, job_execution_id, **kwargs): "jobExecutionId": job_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8854,7 +8853,7 @@ def get_job_execution(self, job_execution_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8930,7 +8929,7 @@ def get_job_run(self, job_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_run got unknown kwargs: {extra_kwargs!r}") @@ -8939,10 +8938,10 @@ def get_job_run(self, job_run_id, **kwargs): "jobRunId": job_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8950,7 +8949,7 @@ def get_job_run(self, job_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9028,7 +9027,7 @@ def get_managed_database(self, managed_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_database got unknown kwargs: {extra_kwargs!r}") @@ -9037,10 +9036,10 @@ def get_managed_database(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9048,7 +9047,7 @@ def get_managed_database(self, managed_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9126,7 +9125,7 @@ def get_managed_database_group(self, managed_database_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -9135,10 +9134,10 @@ def get_managed_database_group(self, managed_database_group_id, **kwargs): "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9146,7 +9145,7 @@ def get_managed_database_group(self, managed_database_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9224,7 +9223,7 @@ def get_named_credential(self, named_credential_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -9233,10 +9232,10 @@ def get_named_credential(self, named_credential_id, **kwargs): "namedCredentialId": named_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9244,7 +9243,7 @@ def get_named_credential(self, named_credential_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9322,7 +9321,7 @@ def get_open_alert_history(self, external_exadata_storage_server_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_open_alert_history got unknown kwargs: {extra_kwargs!r}") @@ -9331,10 +9330,10 @@ def get_open_alert_history(self, external_exadata_storage_server_id, **kwargs): "externalExadataStorageServerId": external_exadata_storage_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9342,7 +9341,7 @@ def get_open_alert_history(self, external_exadata_storage_server_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9433,7 +9432,7 @@ def get_optimizer_statistics_advisor_execution(self, managed_database_id, execut "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_optimizer_statistics_advisor_execution got unknown kwargs: {extra_kwargs!r}") @@ -9443,16 +9442,16 @@ def get_optimizer_statistics_advisor_execution(self, managed_database_id, execut "executionName": execution_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "taskName": task_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9460,7 +9459,7 @@ def get_optimizer_statistics_advisor_execution(self, managed_database_id, execut "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9550,7 +9549,7 @@ def get_optimizer_statistics_advisor_execution_script(self, managed_database_id, "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_optimizer_statistics_advisor_execution_script got unknown kwargs: {extra_kwargs!r}") @@ -9560,16 +9559,16 @@ def get_optimizer_statistics_advisor_execution_script(self, managed_database_id, "executionName": execution_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "taskName": task_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9577,7 +9576,7 @@ def get_optimizer_statistics_advisor_execution_script(self, managed_database_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9664,7 +9663,7 @@ def get_optimizer_statistics_collection_operation(self, managed_database_id, opt "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_optimizer_statistics_collection_operation got unknown kwargs: {extra_kwargs!r}") @@ -9674,10 +9673,10 @@ def get_optimizer_statistics_collection_operation(self, managed_database_id, opt "optimizerStatisticsCollectionOperationId": optimizer_statistics_collection_operation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9686,7 +9685,7 @@ def get_optimizer_statistics_collection_operation(self, managed_database_id, opt "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9791,7 +9790,7 @@ def get_pdb_metrics(self, managed_database_id, start_time, end_time, **kwargs): "compare_type", "filter_by_metric_names" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pdb_metrics got unknown kwargs: {extra_kwargs!r}") @@ -9800,10 +9799,10 @@ def get_pdb_metrics(self, managed_database_id, start_time, end_time, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'compare_type' in kwargs: @@ -9820,14 +9819,14 @@ def get_pdb_metrics(self, managed_database_id, start_time, end_time, **kwargs): "compareType": kwargs.get("compare_type", missing), "filterByMetricNames": kwargs.get("filter_by_metric_names", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9910,7 +9909,7 @@ def get_preferred_credential(self, managed_database_id, credential_name, **kwarg "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_preferred_credential got unknown kwargs: {extra_kwargs!r}") @@ -9920,10 +9919,10 @@ def get_preferred_credential(self, managed_database_id, credential_name, **kwarg "credentialName": credential_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9931,7 +9930,7 @@ def get_preferred_credential(self, managed_database_id, credential_name, **kwarg "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10016,7 +10015,7 @@ def get_sql_plan_baseline(self, managed_database_id, plan_name, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_plan_baseline got unknown kwargs: {extra_kwargs!r}") @@ -10026,10 +10025,10 @@ def get_sql_plan_baseline(self, managed_database_id, plan_name, **kwargs): "planName": plan_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10038,7 +10037,7 @@ def get_sql_plan_baseline(self, managed_database_id, plan_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10124,7 +10123,7 @@ def get_sql_plan_baseline_configuration(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_plan_baseline_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10133,10 +10132,10 @@ def get_sql_plan_baseline_configuration(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10145,7 +10144,7 @@ def get_sql_plan_baseline_configuration(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10232,7 +10231,7 @@ def get_tablespace(self, managed_database_id, tablespace_name, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tablespace got unknown kwargs: {extra_kwargs!r}") @@ -10242,10 +10241,10 @@ def get_tablespace(self, managed_database_id, tablespace_name, **kwargs): "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10254,7 +10253,7 @@ def get_tablespace(self, managed_database_id, tablespace_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10332,7 +10331,7 @@ def get_top_sql_cpu_activity(self, external_exadata_storage_server_id, **kwargs) "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_top_sql_cpu_activity got unknown kwargs: {extra_kwargs!r}") @@ -10341,10 +10340,10 @@ def get_top_sql_cpu_activity(self, external_exadata_storage_server_id, **kwargs) "externalExadataStorageServerId": external_exadata_storage_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10352,7 +10351,7 @@ def get_top_sql_cpu_activity(self, external_exadata_storage_server_id, **kwargs) "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10439,7 +10438,7 @@ def get_user(self, managed_database_id, user_name, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user got unknown kwargs: {extra_kwargs!r}") @@ -10449,10 +10448,10 @@ def get_user(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10461,7 +10460,7 @@ def get_user(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10539,7 +10538,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -10548,10 +10547,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10559,7 +10558,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10643,7 +10642,7 @@ def implement_optimizer_statistics_advisor_recommendations(self, managed_databas "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"implement_optimizer_statistics_advisor_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -10653,10 +10652,10 @@ def implement_optimizer_statistics_advisor_recommendations(self, managed_databas "executionName": execution_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10664,7 +10663,7 @@ def implement_optimizer_statistics_advisor_recommendations(self, managed_databas "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10771,7 +10770,7 @@ def list_asm_properties(self, managed_database_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_asm_properties got unknown kwargs: {extra_kwargs!r}") @@ -10780,10 +10779,10 @@ def list_asm_properties(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -10807,14 +10806,14 @@ def list_asm_properties(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10920,7 +10919,7 @@ def list_associated_databases(self, db_management_private_endpoint_id, compartme "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_associated_databases got unknown kwargs: {extra_kwargs!r}") @@ -10929,10 +10928,10 @@ def list_associated_databases(self, db_management_private_endpoint_id, compartme "dbManagementPrivateEndpointId": db_management_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10956,14 +10955,14 @@ def list_associated_databases(self, db_management_private_endpoint_id, compartme "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11107,7 +11106,7 @@ def list_awr_db_snapshots(self, managed_database_id, awr_db_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_db_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -11117,10 +11116,10 @@ def list_awr_db_snapshots(self, managed_database_id, awr_db_id, **kwargs): "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11149,7 +11148,7 @@ def list_awr_db_snapshots(self, managed_database_id, awr_db_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11158,7 +11157,7 @@ def list_awr_db_snapshots(self, managed_database_id, awr_db_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11284,7 +11283,7 @@ def list_awr_dbs(self, managed_database_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_dbs got unknown kwargs: {extra_kwargs!r}") @@ -11293,10 +11292,10 @@ def list_awr_dbs(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11322,7 +11321,7 @@ def list_awr_dbs(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11331,7 +11330,7 @@ def list_awr_dbs(self, managed_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11445,7 +11444,7 @@ def list_consumer_group_privileges(self, managed_database_id, user_name, **kwarg "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_consumer_group_privileges got unknown kwargs: {extra_kwargs!r}") @@ -11455,10 +11454,10 @@ def list_consumer_group_privileges(self, managed_database_id, user_name, **kwarg "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11482,7 +11481,7 @@ def list_consumer_group_privileges(self, managed_database_id, user_name, **kwarg "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11490,7 +11489,7 @@ def list_consumer_group_privileges(self, managed_database_id, user_name, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11601,7 +11600,7 @@ def list_cursor_cache_statements(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cursor_cache_statements got unknown kwargs: {extra_kwargs!r}") @@ -11610,10 +11609,10 @@ def list_cursor_cache_statements(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11637,7 +11636,7 @@ def list_cursor_cache_statements(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11645,7 +11644,7 @@ def list_cursor_cache_statements(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11760,7 +11759,7 @@ def list_data_access_containers(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_access_containers got unknown kwargs: {extra_kwargs!r}") @@ -11770,10 +11769,10 @@ def list_data_access_containers(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11797,7 +11796,7 @@ def list_data_access_containers(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11805,7 +11804,7 @@ def list_data_access_containers(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11919,7 +11918,7 @@ def list_database_parameters(self, managed_database_id, **kwargs): "sort_order", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_parameters got unknown kwargs: {extra_kwargs!r}") @@ -11928,10 +11927,10 @@ def list_database_parameters(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'source' in kwargs: @@ -11962,7 +11961,7 @@ def list_database_parameters(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11970,7 +11969,7 @@ def list_database_parameters(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12093,7 +12092,7 @@ def list_db_management_private_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_management_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -12130,14 +12129,14 @@ def list_db_management_private_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12241,7 +12240,7 @@ def list_external_asm_disk_groups(self, external_asm_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_asm_disk_groups got unknown kwargs: {extra_kwargs!r}") @@ -12250,10 +12249,10 @@ def list_external_asm_disk_groups(self, external_asm_id, **kwargs): "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -12276,7 +12275,7 @@ def list_external_asm_disk_groups(self, external_asm_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12284,7 +12283,7 @@ def list_external_asm_disk_groups(self, external_asm_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12400,7 +12399,7 @@ def list_external_asm_instances(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_asm_instances got unknown kwargs: {extra_kwargs!r}") @@ -12428,14 +12427,14 @@ def list_external_asm_instances(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12541,7 +12540,7 @@ def list_external_asm_users(self, external_asm_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_asm_users got unknown kwargs: {extra_kwargs!r}") @@ -12550,10 +12549,10 @@ def list_external_asm_users(self, external_asm_id, **kwargs): "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -12576,7 +12575,7 @@ def list_external_asm_users(self, external_asm_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12584,7 +12583,7 @@ def list_external_asm_users(self, external_asm_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12700,7 +12699,7 @@ def list_external_asms(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_asms got unknown kwargs: {extra_kwargs!r}") @@ -12728,14 +12727,14 @@ def list_external_asms(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12849,7 +12848,7 @@ def list_external_cluster_instances(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_cluster_instances got unknown kwargs: {extra_kwargs!r}") @@ -12877,14 +12876,14 @@ def list_external_cluster_instances(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12998,7 +12997,7 @@ def list_external_clusters(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_clusters got unknown kwargs: {extra_kwargs!r}") @@ -13026,14 +13025,14 @@ def list_external_clusters(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13147,7 +13146,7 @@ def list_external_databases(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_databases got unknown kwargs: {extra_kwargs!r}") @@ -13175,14 +13174,14 @@ def list_external_databases(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13296,7 +13295,7 @@ def list_external_db_homes(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_db_homes got unknown kwargs: {extra_kwargs!r}") @@ -13324,14 +13323,14 @@ def list_external_db_homes(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13445,7 +13444,7 @@ def list_external_db_nodes(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_db_nodes got unknown kwargs: {extra_kwargs!r}") @@ -13473,14 +13472,14 @@ def list_external_db_nodes(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13594,7 +13593,7 @@ def list_external_db_system_connectors(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_db_system_connectors got unknown kwargs: {extra_kwargs!r}") @@ -13622,14 +13621,14 @@ def list_external_db_system_connectors(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13736,7 +13735,7 @@ def list_external_db_system_discoveries(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_db_system_discoveries got unknown kwargs: {extra_kwargs!r}") @@ -13763,14 +13762,14 @@ def list_external_db_system_discoveries(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13877,7 +13876,7 @@ def list_external_db_systems(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_db_systems got unknown kwargs: {extra_kwargs!r}") @@ -13904,14 +13903,14 @@ def list_external_db_systems(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14018,7 +14017,7 @@ def list_external_exadata_infrastructures(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_exadata_infrastructures got unknown kwargs: {extra_kwargs!r}") @@ -14045,14 +14044,14 @@ def list_external_exadata_infrastructures(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14164,7 +14163,7 @@ def list_external_exadata_storage_connectors(self, compartment_id, external_exad "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_exadata_storage_connectors got unknown kwargs: {extra_kwargs!r}") @@ -14192,14 +14191,14 @@ def list_external_exadata_storage_connectors(self, compartment_id, external_exad "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14311,7 +14310,7 @@ def list_external_exadata_storage_servers(self, compartment_id, external_exadata "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_exadata_storage_servers got unknown kwargs: {extra_kwargs!r}") @@ -14339,14 +14338,14 @@ def list_external_exadata_storage_servers(self, compartment_id, external_exadata "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14458,7 +14457,7 @@ def list_external_listener_services(self, external_listener_id, managed_database "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_listener_services got unknown kwargs: {extra_kwargs!r}") @@ -14467,10 +14466,10 @@ def list_external_listener_services(self, external_listener_id, managed_database "externalListenerId": external_listener_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14494,7 +14493,7 @@ def list_external_listener_services(self, external_listener_id, managed_database "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -14502,7 +14501,7 @@ def list_external_listener_services(self, external_listener_id, managed_database "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14618,7 +14617,7 @@ def list_external_listeners(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_external_listeners got unknown kwargs: {extra_kwargs!r}") @@ -14646,14 +14645,14 @@ def list_external_listeners(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14791,7 +14790,7 @@ def list_job_executions(self, compartment_id, **kwargs): "sort_order", "job_run_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_executions got unknown kwargs: {extra_kwargs!r}") @@ -14824,14 +14823,14 @@ def list_job_executions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "jobRunId": kwargs.get("job_run_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14963,7 +14962,7 @@ def list_job_runs(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_runs got unknown kwargs: {extra_kwargs!r}") @@ -14995,14 +14994,14 @@ def list_job_runs(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15132,7 +15131,7 @@ def list_jobs(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -15170,14 +15169,14 @@ def list_jobs(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15295,7 +15294,7 @@ def list_managed_database_groups(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_database_groups got unknown kwargs: {extra_kwargs!r}") @@ -15331,14 +15330,14 @@ def list_managed_database_groups(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15470,7 +15469,7 @@ def list_managed_databases(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_databases got unknown kwargs: {extra_kwargs!r}") @@ -15515,14 +15514,14 @@ def list_managed_databases(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15643,7 +15642,7 @@ def list_named_credentials(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_named_credentials got unknown kwargs: {extra_kwargs!r}") @@ -15687,14 +15686,14 @@ def list_named_credentials(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15805,7 +15804,7 @@ def list_object_privileges(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_object_privileges got unknown kwargs: {extra_kwargs!r}") @@ -15815,10 +15814,10 @@ def list_object_privileges(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -15842,7 +15841,7 @@ def list_object_privileges(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15850,7 +15849,7 @@ def list_object_privileges(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15946,7 +15945,7 @@ def list_optimizer_statistics_advisor_executions(self, managed_database_id, **kw "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_optimizer_statistics_advisor_executions got unknown kwargs: {extra_kwargs!r}") @@ -15955,17 +15954,17 @@ def list_optimizer_statistics_advisor_executions(self, managed_database_id, **kw "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "startTimeGreaterThanOrEqualTo": kwargs.get("start_time_greater_than_or_equal_to", missing), "endTimeLessThanOrEqualTo": kwargs.get("end_time_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15973,7 +15972,7 @@ def list_optimizer_statistics_advisor_executions(self, managed_database_id, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16092,7 +16091,7 @@ def list_optimizer_statistics_collection_aggregations(self, managed_database_id, "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_optimizer_statistics_collection_aggregations got unknown kwargs: {extra_kwargs!r}") @@ -16101,10 +16100,10 @@ def list_optimizer_statistics_collection_aggregations(self, managed_database_id, "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'task_type' in kwargs: @@ -16128,7 +16127,7 @@ def list_optimizer_statistics_collection_aggregations(self, managed_database_id, "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16136,7 +16135,7 @@ def list_optimizer_statistics_collection_aggregations(self, managed_database_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16270,7 +16269,7 @@ def list_optimizer_statistics_collection_operations(self, managed_database_id, * "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_optimizer_statistics_collection_operations got unknown kwargs: {extra_kwargs!r}") @@ -16279,10 +16278,10 @@ def list_optimizer_statistics_collection_operations(self, managed_database_id, * "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'task_type' in kwargs: @@ -16316,7 +16315,7 @@ def list_optimizer_statistics_collection_operations(self, managed_database_id, * "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16324,7 +16323,7 @@ def list_optimizer_statistics_collection_operations(self, managed_database_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16404,7 +16403,7 @@ def list_preferred_credentials(self, managed_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_preferred_credentials got unknown kwargs: {extra_kwargs!r}") @@ -16413,10 +16412,10 @@ def list_preferred_credentials(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16424,7 +16423,7 @@ def list_preferred_credentials(self, managed_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16535,7 +16534,7 @@ def list_proxied_for_users(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_proxied_for_users got unknown kwargs: {extra_kwargs!r}") @@ -16545,10 +16544,10 @@ def list_proxied_for_users(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16572,7 +16571,7 @@ def list_proxied_for_users(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16580,7 +16579,7 @@ def list_proxied_for_users(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16693,7 +16692,7 @@ def list_proxy_users(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_proxy_users got unknown kwargs: {extra_kwargs!r}") @@ -16703,10 +16702,10 @@ def list_proxy_users(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16730,7 +16729,7 @@ def list_proxy_users(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16738,7 +16737,7 @@ def list_proxy_users(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16851,7 +16850,7 @@ def list_roles(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_roles got unknown kwargs: {extra_kwargs!r}") @@ -16861,10 +16860,10 @@ def list_roles(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16888,7 +16887,7 @@ def list_roles(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -16896,7 +16895,7 @@ def list_roles(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17007,7 +17006,7 @@ def list_sql_plan_baseline_jobs(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_plan_baseline_jobs got unknown kwargs: {extra_kwargs!r}") @@ -17016,10 +17015,10 @@ def list_sql_plan_baseline_jobs(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17043,7 +17042,7 @@ def list_sql_plan_baseline_jobs(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17051,7 +17050,7 @@ def list_sql_plan_baseline_jobs(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17223,7 +17222,7 @@ def list_sql_plan_baselines(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_plan_baselines got unknown kwargs: {extra_kwargs!r}") @@ -17232,10 +17231,10 @@ def list_sql_plan_baselines(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'origin' in kwargs: @@ -17278,7 +17277,7 @@ def list_sql_plan_baselines(self, managed_database_id, **kwargs): "timeLastExecutedLessThan": kwargs.get("time_last_executed_less_than", missing), "isNeverExecuted": kwargs.get("is_never_executed", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17286,7 +17285,7 @@ def list_sql_plan_baselines(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17401,7 +17400,7 @@ def list_system_privileges(self, managed_database_id, user_name, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_system_privileges got unknown kwargs: {extra_kwargs!r}") @@ -17411,10 +17410,10 @@ def list_system_privileges(self, managed_database_id, user_name, **kwargs): "userName": user_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17438,7 +17437,7 @@ def list_system_privileges(self, managed_database_id, user_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17446,7 +17445,7 @@ def list_system_privileges(self, managed_database_id, user_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17531,7 +17530,7 @@ def list_table_statistics(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_table_statistics got unknown kwargs: {extra_kwargs!r}") @@ -17540,10 +17539,10 @@ def list_table_statistics(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17552,7 +17551,7 @@ def list_table_statistics(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17661,7 +17660,7 @@ def list_tablespaces(self, managed_database_id, **kwargs): "limit", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tablespaces got unknown kwargs: {extra_kwargs!r}") @@ -17670,10 +17669,10 @@ def list_tablespaces(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17697,7 +17696,7 @@ def list_tablespaces(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17705,7 +17704,7 @@ def list_tablespaces(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17816,7 +17815,7 @@ def list_users(self, managed_database_id, **kwargs): "page", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_users got unknown kwargs: {extra_kwargs!r}") @@ -17825,10 +17824,10 @@ def list_users(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17852,7 +17851,7 @@ def list_users(self, managed_database_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17860,7 +17859,7 @@ def list_users(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17961,7 +17960,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -17970,10 +17969,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17996,14 +17995,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18104,7 +18103,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -18113,10 +18112,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18139,14 +18138,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18265,7 +18264,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -18301,14 +18300,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18393,7 +18392,7 @@ def load_sql_plan_baselines_from_awr(self, managed_database_id, load_sql_plan_ba "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"load_sql_plan_baselines_from_awr got unknown kwargs: {extra_kwargs!r}") @@ -18402,10 +18401,10 @@ def load_sql_plan_baselines_from_awr(self, managed_database_id, load_sql_plan_ba "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18413,7 +18412,7 @@ def load_sql_plan_baselines_from_awr(self, managed_database_id, load_sql_plan_ba "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18498,7 +18497,7 @@ def load_sql_plan_baselines_from_cursor_cache(self, managed_database_id, load_sq "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"load_sql_plan_baselines_from_cursor_cache got unknown kwargs: {extra_kwargs!r}") @@ -18507,10 +18506,10 @@ def load_sql_plan_baselines_from_cursor_cache(self, managed_database_id, load_sq "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18518,7 +18517,7 @@ def load_sql_plan_baselines_from_cursor_cache(self, managed_database_id, load_sq "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18609,7 +18608,7 @@ def patch_external_db_system_discovery(self, external_db_system_discovery_id, pa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_external_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -18618,10 +18617,10 @@ def patch_external_db_system_discovery(self, external_db_system_discovery_id, pa "externalDbSystemDiscoveryId": external_db_system_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18630,7 +18629,7 @@ def patch_external_db_system_discovery(self, external_db_system_discovery_id, pa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18724,7 +18723,7 @@ def remove_data_file(self, managed_database_id, tablespace_name, remove_data_fil "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_data_file got unknown kwargs: {extra_kwargs!r}") @@ -18734,10 +18733,10 @@ def remove_data_file(self, managed_database_id, tablespace_name, remove_data_fil "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18746,7 +18745,7 @@ def remove_data_file(self, managed_database_id, tablespace_name, remove_data_fil "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18841,7 +18840,7 @@ def remove_managed_database_from_managed_database_group(self, managed_database_g "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_managed_database_from_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -18850,10 +18849,10 @@ def remove_managed_database_from_managed_database_group(self, managed_database_g "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18862,7 +18861,7 @@ def remove_managed_database_from_managed_database_group(self, managed_database_g "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18952,7 +18951,7 @@ def reset_database_parameters(self, managed_database_id, reset_database_paramete "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_database_parameters got unknown kwargs: {extra_kwargs!r}") @@ -18961,10 +18960,10 @@ def reset_database_parameters(self, managed_database_id, reset_database_paramete "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18973,7 +18972,7 @@ def reset_database_parameters(self, managed_database_id, reset_database_paramete "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19068,7 +19067,7 @@ def resize_data_file(self, managed_database_id, tablespace_name, resize_data_fil "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resize_data_file got unknown kwargs: {extra_kwargs!r}") @@ -19078,10 +19077,10 @@ def resize_data_file(self, managed_database_id, tablespace_name, resize_data_fil "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19090,7 +19089,7 @@ def resize_data_file(self, managed_database_id, tablespace_name, resize_data_fil "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19187,7 +19186,7 @@ def run_historic_addm(self, managed_database_id, run_historic_addm_details, **kw "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"run_historic_addm got unknown kwargs: {extra_kwargs!r}") @@ -19196,10 +19195,10 @@ def run_historic_addm(self, managed_database_id, run_historic_addm_details, **kw "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19209,7 +19208,7 @@ def run_historic_addm(self, managed_database_id, run_historic_addm_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19360,7 +19359,7 @@ def summarize_awr_db_cpu_usages(self, managed_database_id, awr_db_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_cpu_usages got unknown kwargs: {extra_kwargs!r}") @@ -19370,10 +19369,10 @@ def summarize_awr_db_cpu_usages(self, managed_database_id, awr_db_id, **kwargs): "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -19410,7 +19409,7 @@ def summarize_awr_db_cpu_usages(self, managed_database_id, awr_db_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19419,7 +19418,7 @@ def summarize_awr_db_cpu_usages(self, managed_database_id, awr_db_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19567,7 +19566,7 @@ def summarize_awr_db_metrics(self, managed_database_id, awr_db_id, name, **kwarg "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_metrics got unknown kwargs: {extra_kwargs!r}") @@ -19577,10 +19576,10 @@ def summarize_awr_db_metrics(self, managed_database_id, awr_db_id, name, **kwarg "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -19610,7 +19609,7 @@ def summarize_awr_db_metrics(self, managed_database_id, awr_db_id, name, **kwarg "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19619,7 +19618,7 @@ def summarize_awr_db_metrics(self, managed_database_id, awr_db_id, name, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19771,7 +19770,7 @@ def summarize_awr_db_parameter_changes(self, managed_database_id, awr_db_id, nam "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_parameter_changes got unknown kwargs: {extra_kwargs!r}") @@ -19781,10 +19780,10 @@ def summarize_awr_db_parameter_changes(self, managed_database_id, awr_db_id, nam "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -19814,7 +19813,7 @@ def summarize_awr_db_parameter_changes(self, managed_database_id, awr_db_id, nam "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -19823,7 +19822,7 @@ def summarize_awr_db_parameter_changes(self, managed_database_id, awr_db_id, nam "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20004,7 +20003,7 @@ def summarize_awr_db_parameters(self, managed_database_id, awr_db_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_parameters got unknown kwargs: {extra_kwargs!r}") @@ -20014,10 +20013,10 @@ def summarize_awr_db_parameters(self, managed_database_id, awr_db_id, **kwargs): "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'value_changed' in kwargs: @@ -20072,7 +20071,7 @@ def summarize_awr_db_parameters(self, managed_database_id, awr_db_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20081,7 +20080,7 @@ def summarize_awr_db_parameters(self, managed_database_id, awr_db_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20207,7 +20206,7 @@ def summarize_awr_db_snapshot_ranges(self, managed_database_id, **kwargs): "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_snapshot_ranges got unknown kwargs: {extra_kwargs!r}") @@ -20216,10 +20215,10 @@ def summarize_awr_db_snapshot_ranges(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -20245,7 +20244,7 @@ def summarize_awr_db_snapshot_ranges(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20254,7 +20253,7 @@ def summarize_awr_db_snapshot_ranges(self, managed_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20402,7 +20401,7 @@ def summarize_awr_db_sysstats(self, managed_database_id, awr_db_id, name, **kwar "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_sysstats got unknown kwargs: {extra_kwargs!r}") @@ -20412,10 +20411,10 @@ def summarize_awr_db_sysstats(self, managed_database_id, awr_db_id, name, **kwar "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -20445,7 +20444,7 @@ def summarize_awr_db_sysstats(self, managed_database_id, awr_db_id, name, **kwar "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20454,7 +20453,7 @@ def summarize_awr_db_sysstats(self, managed_database_id, awr_db_id, name, **kwar "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20600,7 +20599,7 @@ def summarize_awr_db_top_wait_events(self, managed_database_id, awr_db_id, **kwa "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_top_wait_events got unknown kwargs: {extra_kwargs!r}") @@ -20610,10 +20609,10 @@ def summarize_awr_db_top_wait_events(self, managed_database_id, awr_db_id, **kwa "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -20649,7 +20648,7 @@ def summarize_awr_db_top_wait_events(self, managed_database_id, awr_db_id, **kwa "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20658,7 +20657,7 @@ def summarize_awr_db_top_wait_events(self, managed_database_id, awr_db_id, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20818,7 +20817,7 @@ def summarize_awr_db_wait_event_buckets(self, managed_database_id, awr_db_id, na "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_wait_event_buckets got unknown kwargs: {extra_kwargs!r}") @@ -20828,10 +20827,10 @@ def summarize_awr_db_wait_event_buckets(self, managed_database_id, awr_db_id, na "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -20864,7 +20863,7 @@ def summarize_awr_db_wait_event_buckets(self, managed_database_id, awr_db_id, na "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20873,7 +20872,7 @@ def summarize_awr_db_wait_event_buckets(self, managed_database_id, awr_db_id, na "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21028,7 +21027,7 @@ def summarize_awr_db_wait_events(self, managed_database_id, awr_db_id, **kwargs) "opc_retry_token", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_db_wait_events got unknown kwargs: {extra_kwargs!r}") @@ -21038,10 +21037,10 @@ def summarize_awr_db_wait_events(self, managed_database_id, awr_db_id, **kwargs) "awrDbId": awr_db_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -21079,7 +21078,7 @@ def summarize_awr_db_wait_events(self, managed_database_id, awr_db_id, **kwargs) "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21088,7 +21087,7 @@ def summarize_awr_db_wait_events(self, managed_database_id, awr_db_id, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21190,7 +21189,7 @@ def summarize_external_asm_metrics(self, external_asm_id, start_time, end_time, "limit", "filter_by_metric_names" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_external_asm_metrics got unknown kwargs: {extra_kwargs!r}") @@ -21199,10 +21198,10 @@ def summarize_external_asm_metrics(self, external_asm_id, start_time, end_time, "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -21212,14 +21211,14 @@ def summarize_external_asm_metrics(self, external_asm_id, start_time, end_time, "endTime": end_time, "filterByMetricNames": kwargs.get("filter_by_metric_names", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21322,7 +21321,7 @@ def summarize_external_cluster_metrics(self, external_cluster_id, start_time, en "limit", "filter_by_metric_names" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_external_cluster_metrics got unknown kwargs: {extra_kwargs!r}") @@ -21331,10 +21330,10 @@ def summarize_external_cluster_metrics(self, external_cluster_id, start_time, en "externalClusterId": external_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -21344,14 +21343,14 @@ def summarize_external_cluster_metrics(self, external_cluster_id, start_time, en "endTime": end_time, "filterByMetricNames": kwargs.get("filter_by_metric_names", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21454,7 +21453,7 @@ def summarize_external_db_node_metrics(self, external_db_node_id, start_time, en "limit", "filter_by_metric_names" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_external_db_node_metrics got unknown kwargs: {extra_kwargs!r}") @@ -21463,10 +21462,10 @@ def summarize_external_db_node_metrics(self, external_db_node_id, start_time, en "externalDbNodeId": external_db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -21476,14 +21475,14 @@ def summarize_external_db_node_metrics(self, external_db_node_id, start_time, en "endTime": end_time, "filterByMetricNames": kwargs.get("filter_by_metric_names", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21586,7 +21585,7 @@ def summarize_external_db_system_availability_metrics(self, external_db_system_i "limit", "filter_by_component_types" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_external_db_system_availability_metrics got unknown kwargs: {extra_kwargs!r}") @@ -21595,10 +21594,10 @@ def summarize_external_db_system_availability_metrics(self, external_db_system_i "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -21608,14 +21607,14 @@ def summarize_external_db_system_availability_metrics(self, external_db_system_i "startTime": start_time, "endTime": end_time } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21718,7 +21717,7 @@ def summarize_external_listener_metrics(self, external_listener_id, start_time, "limit", "filter_by_metric_names" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_external_listener_metrics got unknown kwargs: {extra_kwargs!r}") @@ -21727,10 +21726,10 @@ def summarize_external_listener_metrics(self, external_listener_id, start_time, "externalListenerId": external_listener_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -21740,14 +21739,14 @@ def summarize_external_listener_metrics(self, external_listener_id, start_time, "endTime": end_time, "filterByMetricNames": kwargs.get("filter_by_metric_names", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21871,7 +21870,7 @@ def summarize_job_executions_statuses(self, compartment_id, start_time, end_time "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_job_executions_statuses got unknown kwargs: {extra_kwargs!r}") @@ -21901,14 +21900,14 @@ def summarize_job_executions_statuses(self, compartment_id, start_time, end_time "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22004,7 +22003,7 @@ def summarize_managed_database_availability_metrics(self, managed_database_id, s "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_managed_database_availability_metrics got unknown kwargs: {extra_kwargs!r}") @@ -22013,10 +22012,10 @@ def summarize_managed_database_availability_metrics(self, managed_database_id, s "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -22025,14 +22024,14 @@ def summarize_managed_database_availability_metrics(self, managed_database_id, s "startTime": start_time, "endTime": end_time } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22123,7 +22122,7 @@ def summarize_sql_plan_baselines(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_plan_baselines got unknown kwargs: {extra_kwargs!r}") @@ -22132,16 +22131,16 @@ def summarize_sql_plan_baselines(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22149,7 +22148,7 @@ def summarize_sql_plan_baselines(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22240,7 +22239,7 @@ def summarize_sql_plan_baselines_by_last_execution(self, managed_database_id, ** "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_plan_baselines_by_last_execution got unknown kwargs: {extra_kwargs!r}") @@ -22249,16 +22248,16 @@ def summarize_sql_plan_baselines_by_last_execution(self, managed_database_id, ** "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22266,7 +22265,7 @@ def summarize_sql_plan_baselines_by_last_execution(self, managed_database_id, ** "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22353,7 +22352,7 @@ def test_named_credential(self, named_credential_id, test_named_credential_detai "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -22362,10 +22361,10 @@ def test_named_credential(self, named_credential_id, test_named_credential_detai "namedCredentialId": named_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22373,7 +22372,7 @@ def test_named_credential(self, named_credential_id, test_named_credential_detai "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22460,7 +22459,7 @@ def test_preferred_credential(self, managed_database_id, credential_name, **kwar "opc_request_id", "test_preferred_credential_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_preferred_credential got unknown kwargs: {extra_kwargs!r}") @@ -22470,10 +22469,10 @@ def test_preferred_credential(self, managed_database_id, credential_name, **kwar "credentialName": credential_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22481,7 +22480,7 @@ def test_preferred_credential(self, managed_database_id, credential_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22572,7 +22571,7 @@ def update_db_management_private_endpoint(self, db_management_private_endpoint_i "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_management_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -22581,10 +22580,10 @@ def update_db_management_private_endpoint(self, db_management_private_endpoint_i "dbManagementPrivateEndpointId": db_management_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22593,7 +22592,7 @@ def update_db_management_private_endpoint(self, db_management_private_endpoint_i "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22684,7 +22683,7 @@ def update_external_asm(self, external_asm_id, update_external_asm_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_asm got unknown kwargs: {extra_kwargs!r}") @@ -22693,10 +22692,10 @@ def update_external_asm(self, external_asm_id, update_external_asm_details, **kw "externalAsmId": external_asm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22705,7 +22704,7 @@ def update_external_asm(self, external_asm_id, update_external_asm_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22794,7 +22793,7 @@ def update_external_asm_instance(self, external_asm_instance_id, update_external "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_asm_instance got unknown kwargs: {extra_kwargs!r}") @@ -22803,10 +22802,10 @@ def update_external_asm_instance(self, external_asm_instance_id, update_external "externalAsmInstanceId": external_asm_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22815,7 +22814,7 @@ def update_external_asm_instance(self, external_asm_instance_id, update_external "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22906,7 +22905,7 @@ def update_external_cluster(self, external_cluster_id, update_external_cluster_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_cluster got unknown kwargs: {extra_kwargs!r}") @@ -22915,10 +22914,10 @@ def update_external_cluster(self, external_cluster_id, update_external_cluster_d "externalClusterId": external_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22927,7 +22926,7 @@ def update_external_cluster(self, external_cluster_id, update_external_cluster_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23016,7 +23015,7 @@ def update_external_cluster_instance(self, external_cluster_instance_id, update_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_cluster_instance got unknown kwargs: {extra_kwargs!r}") @@ -23025,10 +23024,10 @@ def update_external_cluster_instance(self, external_cluster_instance_id, update_ "externalClusterInstanceId": external_cluster_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23037,7 +23036,7 @@ def update_external_cluster_instance(self, external_cluster_instance_id, update_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23126,7 +23125,7 @@ def update_external_db_home(self, external_db_home_id, update_external_db_home_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_db_home got unknown kwargs: {extra_kwargs!r}") @@ -23135,10 +23134,10 @@ def update_external_db_home(self, external_db_home_id, update_external_db_home_d "externalDbHomeId": external_db_home_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23147,7 +23146,7 @@ def update_external_db_home(self, external_db_home_id, update_external_db_home_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23238,7 +23237,7 @@ def update_external_db_node(self, external_db_node_id, update_external_db_node_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_db_node got unknown kwargs: {extra_kwargs!r}") @@ -23247,10 +23246,10 @@ def update_external_db_node(self, external_db_node_id, update_external_db_node_d "externalDbNodeId": external_db_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23259,7 +23258,7 @@ def update_external_db_node(self, external_db_node_id, update_external_db_node_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23348,7 +23347,7 @@ def update_external_db_system(self, external_db_system_id, update_external_db_sy "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_db_system got unknown kwargs: {extra_kwargs!r}") @@ -23357,10 +23356,10 @@ def update_external_db_system(self, external_db_system_id, update_external_db_sy "externalDbSystemId": external_db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23369,7 +23368,7 @@ def update_external_db_system(self, external_db_system_id, update_external_db_sy "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23460,7 +23459,7 @@ def update_external_db_system_connector(self, external_db_system_connector_id, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -23469,10 +23468,10 @@ def update_external_db_system_connector(self, external_db_system_connector_id, u "externalDbSystemConnectorId": external_db_system_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23481,7 +23480,7 @@ def update_external_db_system_connector(self, external_db_system_connector_id, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23570,7 +23569,7 @@ def update_external_db_system_discovery(self, external_db_system_discovery_id, u "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -23579,10 +23578,10 @@ def update_external_db_system_discovery(self, external_db_system_discovery_id, u "externalDbSystemDiscoveryId": external_db_system_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23591,7 +23590,7 @@ def update_external_db_system_discovery(self, external_db_system_discovery_id, u "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23690,7 +23689,7 @@ def update_external_exadata_infrastructure(self, external_exadata_infrastructure "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -23699,10 +23698,10 @@ def update_external_exadata_infrastructure(self, external_exadata_infrastructure "externalExadataInfrastructureId": external_exadata_infrastructure_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23712,7 +23711,7 @@ def update_external_exadata_infrastructure(self, external_exadata_infrastructure "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23806,7 +23805,7 @@ def update_external_exadata_storage_connector(self, external_exadata_storage_con "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_exadata_storage_connector got unknown kwargs: {extra_kwargs!r}") @@ -23815,10 +23814,10 @@ def update_external_exadata_storage_connector(self, external_exadata_storage_con "externalExadataStorageConnectorId": external_exadata_storage_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23827,7 +23826,7 @@ def update_external_exadata_storage_connector(self, external_exadata_storage_con "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23918,7 +23917,7 @@ def update_external_exadata_storage_grid(self, external_exadata_storage_grid_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_exadata_storage_grid got unknown kwargs: {extra_kwargs!r}") @@ -23927,10 +23926,10 @@ def update_external_exadata_storage_grid(self, external_exadata_storage_grid_id, "externalExadataStorageGridId": external_exadata_storage_grid_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23939,7 +23938,7 @@ def update_external_exadata_storage_grid(self, external_exadata_storage_grid_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24030,7 +24029,7 @@ def update_external_exadata_storage_server(self, external_exadata_storage_server "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_exadata_storage_server got unknown kwargs: {extra_kwargs!r}") @@ -24039,10 +24038,10 @@ def update_external_exadata_storage_server(self, external_exadata_storage_server "externalExadataStorageServerId": external_exadata_storage_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24051,7 +24050,7 @@ def update_external_exadata_storage_server(self, external_exadata_storage_server "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24142,7 +24141,7 @@ def update_external_listener(self, external_listener_id, update_external_listene "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_external_listener got unknown kwargs: {extra_kwargs!r}") @@ -24151,10 +24150,10 @@ def update_external_listener(self, external_listener_id, update_external_listene "externalListenerId": external_listener_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24163,7 +24162,7 @@ def update_external_listener(self, external_listener_id, update_external_listene "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24250,7 +24249,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -24259,10 +24258,10 @@ def update_job(self, job_id, update_job_details, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24271,7 +24270,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24362,7 +24361,7 @@ def update_managed_database(self, managed_database_id, update_managed_database_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_database got unknown kwargs: {extra_kwargs!r}") @@ -24371,10 +24370,10 @@ def update_managed_database(self, managed_database_id, update_managed_database_d "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24383,7 +24382,7 @@ def update_managed_database(self, managed_database_id, update_managed_database_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24474,7 +24473,7 @@ def update_managed_database_group(self, managed_database_group_id, update_manage "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_database_group got unknown kwargs: {extra_kwargs!r}") @@ -24483,10 +24482,10 @@ def update_managed_database_group(self, managed_database_group_id, update_manage "managedDatabaseGroupId": managed_database_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24495,7 +24494,7 @@ def update_managed_database_group(self, managed_database_group_id, update_manage "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24586,7 +24585,7 @@ def update_named_credential(self, named_credential_id, update_named_credential_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -24595,10 +24594,10 @@ def update_named_credential(self, named_credential_id, update_named_credential_d "namedCredentialId": named_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24607,7 +24606,7 @@ def update_named_credential(self, named_credential_id, update_named_credential_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24701,7 +24700,7 @@ def update_preferred_credential(self, managed_database_id, credential_name, upda "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_preferred_credential got unknown kwargs: {extra_kwargs!r}") @@ -24711,10 +24710,10 @@ def update_preferred_credential(self, managed_database_id, credential_name, upda "credentialName": credential_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24723,7 +24722,7 @@ def update_preferred_credential(self, managed_database_id, credential_name, upda "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24809,7 +24808,7 @@ def update_tablespace(self, managed_database_id, tablespace_name, update_tablesp "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tablespace got unknown kwargs: {extra_kwargs!r}") @@ -24819,10 +24818,10 @@ def update_tablespace(self, managed_database_id, tablespace_name, update_tablesp "tablespaceName": tablespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24830,7 +24829,7 @@ def update_tablespace(self, managed_database_id, tablespace_name, update_tablesp "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_management/diagnosability_client.py b/src/oci/database_management/diagnosability_client.py index 62bb9996e1..96ecc43f04 100644 --- a/src/oci/database_management/diagnosability_client.py +++ b/src/oci/database_management/diagnosability_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -215,7 +214,7 @@ def list_alert_logs(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alert_logs got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def list_alert_logs(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'level_filter' in kwargs: @@ -270,7 +269,7 @@ def list_alert_logs(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -278,7 +277,7 @@ def list_alert_logs(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -411,7 +410,7 @@ def list_attention_logs(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_attention_logs got unknown kwargs: {extra_kwargs!r}") @@ -420,10 +419,10 @@ def list_attention_logs(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'urgency_filter' in kwargs: @@ -466,7 +465,7 @@ def list_attention_logs(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -474,7 +473,7 @@ def list_attention_logs(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -601,7 +600,7 @@ def summarize_alert_log_counts(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_alert_log_counts got unknown kwargs: {extra_kwargs!r}") @@ -610,10 +609,10 @@ def summarize_alert_log_counts(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'level_filter' in kwargs: @@ -648,7 +647,7 @@ def summarize_alert_log_counts(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -656,7 +655,7 @@ def summarize_alert_log_counts(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -783,7 +782,7 @@ def summarize_attention_log_counts(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_attention_log_counts got unknown kwargs: {extra_kwargs!r}") @@ -792,10 +791,10 @@ def summarize_attention_log_counts(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'urgency_filter' in kwargs: @@ -830,7 +829,7 @@ def summarize_attention_log_counts(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -838,7 +837,7 @@ def summarize_attention_log_counts(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_management/managed_my_sql_databases_client.py b/src/oci/database_management/managed_my_sql_databases_client.py index 081fca81cd..d3de42abcb 100644 --- a/src/oci/database_management/managed_my_sql_databases_client.py +++ b/src/oci/database_management/managed_my_sql_databases_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def get_heat_wave_fleet_metric(self, compartment_id, start_time, end_time, **kwa "filter_by_heat_wave_shape", "is_heat_wave_lakehouse_enabled" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_heat_wave_fleet_metric got unknown kwargs: {extra_kwargs!r}") @@ -209,14 +208,14 @@ def get_heat_wave_fleet_metric(self, compartment_id, start_time, end_time, **kwa "filterByHeatWaveShape": kwargs.get("filter_by_heat_wave_shape", missing), "isHeatWaveLakehouseEnabled": kwargs.get("is_heat_wave_lakehouse_enabled", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -292,7 +291,7 @@ def get_managed_my_sql_database(self, managed_my_sql_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_my_sql_database got unknown kwargs: {extra_kwargs!r}") @@ -301,10 +300,10 @@ def get_managed_my_sql_database(self, managed_my_sql_database_id, **kwargs): "managedMySqlDatabaseId": managed_my_sql_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -312,7 +311,7 @@ def get_managed_my_sql_database(self, managed_my_sql_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -428,7 +427,7 @@ def get_my_sql_fleet_metric(self, compartment_id, start_time, end_time, **kwargs "filter_by_my_sql_database_version", "is_heat_wave_enabled" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_sql_fleet_metric got unknown kwargs: {extra_kwargs!r}") @@ -465,14 +464,14 @@ def get_my_sql_fleet_metric(self, compartment_id, start_time, end_time, **kwargs "filterByMySqlDatabaseVersion": kwargs.get("filter_by_my_sql_database_version", missing), "isHeatWaveEnabled": kwargs.get("is_heat_wave_enabled", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -571,7 +570,7 @@ def list_managed_my_sql_database_configuration_data(self, managed_my_sql_databas "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_my_sql_database_configuration_data got unknown kwargs: {extra_kwargs!r}") @@ -580,10 +579,10 @@ def list_managed_my_sql_database_configuration_data(self, managed_my_sql_databas "managedMySqlDatabaseId": managed_my_sql_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -606,14 +605,14 @@ def list_managed_my_sql_database_configuration_data(self, managed_my_sql_databas "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -742,7 +741,7 @@ def list_managed_my_sql_database_sql_data(self, managed_my_sql_database_id, star "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_my_sql_database_sql_data got unknown kwargs: {extra_kwargs!r}") @@ -751,10 +750,10 @@ def list_managed_my_sql_database_sql_data(self, managed_my_sql_database_id, star "managedMySqlDatabaseId": managed_my_sql_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -780,14 +779,14 @@ def list_managed_my_sql_database_sql_data(self, managed_my_sql_database_id, star "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -892,7 +891,7 @@ def list_managed_my_sql_databases(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_my_sql_databases got unknown kwargs: {extra_kwargs!r}") @@ -918,14 +917,14 @@ def list_managed_my_sql_databases(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1018,7 +1017,7 @@ def summarize_managed_my_sql_database_availability_metrics(self, managed_my_sql_ "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_managed_my_sql_database_availability_metrics got unknown kwargs: {extra_kwargs!r}") @@ -1027,10 +1026,10 @@ def summarize_managed_my_sql_database_availability_metrics(self, managed_my_sql_ "managedMySqlDatabaseId": managed_my_sql_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1039,14 +1038,14 @@ def summarize_managed_my_sql_database_availability_metrics(self, managed_my_sql_ "startTime": start_time, "endTime": end_time } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_management/perfhub_client.py b/src/oci/database_management/perfhub_client.py index 59d010bd16..05b4bf90b3 100644 --- a/src/oci/database_management/perfhub_client.py +++ b/src/oci/database_management/perfhub_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def modify_snapshot_settings(self, managed_database_id, modify_snapshot_settings "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"modify_snapshot_settings got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def modify_snapshot_settings(self, managed_database_id, modify_snapshot_settings "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def modify_snapshot_settings(self, managed_database_id, modify_snapshot_settings "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_management/sql_tuning_client.py b/src/oci/database_management/sql_tuning_client.py index 8903f891c8..852db4653b 100644 --- a/src/oci/database_management/sql_tuning_client.py +++ b/src/oci/database_management/sql_tuning_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def clone_sql_tuning_task(self, managed_database_id, clone_sql_tuning_task_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clone_sql_tuning_task got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def clone_sql_tuning_task(self, managed_database_id, clone_sql_tuning_task_detai "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def clone_sql_tuning_task(self, managed_database_id, clone_sql_tuning_task_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_sql_tuning_set(self, managed_database_id, create_sql_tuning_set_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sql_tuning_set got unknown kwargs: {extra_kwargs!r}") @@ -295,10 +294,10 @@ def create_sql_tuning_set(self, managed_database_id, create_sql_tuning_set_detai "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -307,7 +306,7 @@ def create_sql_tuning_set(self, managed_database_id, create_sql_tuning_set_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -404,7 +403,7 @@ def drop_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, drop_sql_t "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"drop_sql_tuning_set got unknown kwargs: {extra_kwargs!r}") @@ -414,10 +413,10 @@ def drop_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, drop_sql_t "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -426,7 +425,7 @@ def drop_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, drop_sql_t "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -520,7 +519,7 @@ def drop_sql_tuning_task(self, managed_database_id, drop_sql_tuning_task_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"drop_sql_tuning_task got unknown kwargs: {extra_kwargs!r}") @@ -529,10 +528,10 @@ def drop_sql_tuning_task(self, managed_database_id, drop_sql_tuning_task_details "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -541,7 +540,7 @@ def drop_sql_tuning_task(self, managed_database_id, drop_sql_tuning_task_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -635,7 +634,7 @@ def drop_sqls_in_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, dr "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"drop_sqls_in_sql_tuning_set got unknown kwargs: {extra_kwargs!r}") @@ -645,10 +644,10 @@ def drop_sqls_in_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, dr "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -657,7 +656,7 @@ def drop_sqls_in_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, dr "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -754,7 +753,7 @@ def fetch_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, fetch_sql "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fetch_sql_tuning_set got unknown kwargs: {extra_kwargs!r}") @@ -764,10 +763,10 @@ def fetch_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, fetch_sql "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -776,7 +775,7 @@ def fetch_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, fetch_sql "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -880,7 +879,7 @@ def get_execution_plan_stats_comparision(self, managed_database_id, sql_tuning_a "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_execution_plan_stats_comparision got unknown kwargs: {extra_kwargs!r}") @@ -890,17 +889,17 @@ def get_execution_plan_stats_comparision(self, managed_database_id, sql_tuning_a "sqlTuningAdvisorTaskId": sql_tuning_advisor_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "sqlObjectId": sql_object_id, "executionId": execution_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -908,7 +907,7 @@ def get_execution_plan_stats_comparision(self, managed_database_id, sql_tuning_a "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1007,7 +1006,7 @@ def get_sql_execution_plan(self, managed_database_id, sql_tuning_advisor_task_id "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_execution_plan got unknown kwargs: {extra_kwargs!r}") @@ -1017,10 +1016,10 @@ def get_sql_execution_plan(self, managed_database_id, sql_tuning_advisor_task_id "sqlTuningAdvisorTaskId": sql_tuning_advisor_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') attribute_allowed_values = ["ORIGINAL", "ORIGINAL_WITH_ADJUSTED_COST", "USING_SQL_PROFILE", "USING_NEW_INDICES", "USING_PARALLEL_EXECUTION"] @@ -1033,7 +1032,7 @@ def get_sql_execution_plan(self, managed_database_id, sql_tuning_advisor_task_id "sqlObjectId": sql_object_id, "attribute": attribute } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1041,7 +1040,7 @@ def get_sql_execution_plan(self, managed_database_id, sql_tuning_advisor_task_id "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1152,7 +1151,7 @@ def get_sql_tuning_advisor_task_summary_report(self, managed_database_id, sql_tu "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sql_tuning_advisor_task_summary_report got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def get_sql_tuning_advisor_task_summary_report(self, managed_database_id, sql_tu "sqlTuningAdvisorTaskId": sql_tuning_advisor_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'search_period' in kwargs: @@ -1182,7 +1181,7 @@ def get_sql_tuning_advisor_task_summary_report(self, managed_database_id, sql_tu "beginExecIdGreaterThanOrEqualTo": kwargs.get("begin_exec_id_greater_than_or_equal_to", missing), "endExecIdLessThanOrEqualTo": kwargs.get("end_exec_id_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1190,7 +1189,7 @@ def get_sql_tuning_advisor_task_summary_report(self, managed_database_id, sql_tu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1329,7 +1328,7 @@ def list_sql_tuning_advisor_task_findings(self, managed_database_id, sql_tuning_ "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_tuning_advisor_task_findings got unknown kwargs: {extra_kwargs!r}") @@ -1339,10 +1338,10 @@ def list_sql_tuning_advisor_task_findings(self, managed_database_id, sql_tuning_ "sqlTuningAdvisorTaskId": sql_tuning_advisor_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'search_period' in kwargs: @@ -1385,7 +1384,7 @@ def list_sql_tuning_advisor_task_findings(self, managed_database_id, sql_tuning_ "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1393,7 +1392,7 @@ def list_sql_tuning_advisor_task_findings(self, managed_database_id, sql_tuning_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1514,7 +1513,7 @@ def list_sql_tuning_advisor_task_recommendations(self, managed_database_id, sql_ "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_tuning_advisor_task_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -1524,10 +1523,10 @@ def list_sql_tuning_advisor_task_recommendations(self, managed_database_id, sql_ "sqlTuningAdvisorTaskId": sql_tuning_advisor_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1552,7 +1551,7 @@ def list_sql_tuning_advisor_task_recommendations(self, managed_database_id, sql_ "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1560,7 +1559,7 @@ def list_sql_tuning_advisor_task_recommendations(self, managed_database_id, sql_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1683,7 +1682,7 @@ def list_sql_tuning_advisor_tasks(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_tuning_advisor_tasks got unknown kwargs: {extra_kwargs!r}") @@ -1692,10 +1691,10 @@ def list_sql_tuning_advisor_tasks(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'status' in kwargs: @@ -1729,7 +1728,7 @@ def list_sql_tuning_advisor_tasks(self, managed_database_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1737,7 +1736,7 @@ def list_sql_tuning_advisor_tasks(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1850,7 +1849,7 @@ def list_sql_tuning_sets(self, managed_database_id, **kwargs): "opc_request_id", "opc_named_credential_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_tuning_sets got unknown kwargs: {extra_kwargs!r}") @@ -1859,10 +1858,10 @@ def list_sql_tuning_sets(self, managed_database_id, **kwargs): "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1887,7 +1886,7 @@ def list_sql_tuning_sets(self, managed_database_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1895,7 +1894,7 @@ def list_sql_tuning_sets(self, managed_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-named-credential-id": kwargs.get("opc_named_credential_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1989,7 +1988,7 @@ def load_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, load_sql_t "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"load_sql_tuning_set got unknown kwargs: {extra_kwargs!r}") @@ -1999,10 +1998,10 @@ def load_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, load_sql_t "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2011,7 +2010,7 @@ def load_sql_tuning_set(self, managed_database_id, sql_tuning_set_id, load_sql_t "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2108,7 +2107,7 @@ def save_sql_tuning_set_as(self, managed_database_id, sql_tuning_set_id, save_sq "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"save_sql_tuning_set_as got unknown kwargs: {extra_kwargs!r}") @@ -2118,10 +2117,10 @@ def save_sql_tuning_set_as(self, managed_database_id, sql_tuning_set_id, save_sq "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2130,7 +2129,7 @@ def save_sql_tuning_set_as(self, managed_database_id, sql_tuning_set_id, save_sq "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2224,7 +2223,7 @@ def start_sql_tuning_task(self, managed_database_id, start_sql_tuning_task_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_sql_tuning_task got unknown kwargs: {extra_kwargs!r}") @@ -2233,10 +2232,10 @@ def start_sql_tuning_task(self, managed_database_id, start_sql_tuning_task_detai "managedDatabaseId": managed_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2245,7 +2244,7 @@ def start_sql_tuning_task(self, managed_database_id, start_sql_tuning_task_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2340,7 +2339,7 @@ def validate_basic_filter(self, managed_database_id, sql_tuning_set_id, validate "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_basic_filter got unknown kwargs: {extra_kwargs!r}") @@ -2350,10 +2349,10 @@ def validate_basic_filter(self, managed_database_id, sql_tuning_set_id, validate "sqlTuningSetId": sql_tuning_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2362,7 +2361,7 @@ def validate_basic_filter(self, managed_database_id, sql_tuning_set_id, validate "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_migration/database_migration_client.py b/src/oci/database_migration/database_migration_client.py index e9a1405301..d603142d93 100644 --- a/src/oci/database_migration/database_migration_client.py +++ b/src/oci/database_migration/database_migration_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def abort_job(self, job_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"abort_job got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def abort_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def abort_job(self, job_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -288,7 +287,7 @@ def add_migration_objects(self, migration_id, add_migration_objects_details, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_migration_objects got unknown kwargs: {extra_kwargs!r}") @@ -297,10 +296,10 @@ def add_migration_objects(self, migration_id, add_migration_objects_details, **k "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -309,7 +308,7 @@ def add_migration_objects(self, migration_id, add_migration_objects_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -407,7 +406,7 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_agent_compartment got unknown kwargs: {extra_kwargs!r}") @@ -416,10 +415,10 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -429,7 +428,7 @@ def change_agent_compartment(self, agent_id, change_agent_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -528,7 +527,7 @@ def change_connection_compartment(self, connection_id, change_connection_compart "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -537,10 +536,10 @@ def change_connection_compartment(self, connection_id, change_connection_compart "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -550,7 +549,7 @@ def change_connection_compartment(self, connection_id, change_connection_compart "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -649,7 +648,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_migration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -658,10 +657,10 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -671,7 +670,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -770,7 +769,7 @@ def clone_migration(self, migration_id, clone_migration_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clone_migration got unknown kwargs: {extra_kwargs!r}") @@ -779,10 +778,10 @@ def clone_migration(self, migration_id, clone_migration_details, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -792,7 +791,7 @@ def clone_migration(self, migration_id, clone_migration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -890,7 +889,7 @@ def connection_diagnostics(self, connection_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"connection_diagnostics got unknown kwargs: {extra_kwargs!r}") @@ -899,10 +898,10 @@ def connection_diagnostics(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -912,7 +911,7 @@ def connection_diagnostics(self, connection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1001,7 +1000,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection got unknown kwargs: {extra_kwargs!r}") @@ -1012,7 +1011,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1102,7 +1101,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_migration got unknown kwargs: {extra_kwargs!r}") @@ -1113,7 +1112,7 @@ def create_migration(self, create_migration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1201,7 +1200,7 @@ def delete_agent(self, agent_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_agent got unknown kwargs: {extra_kwargs!r}") @@ -1210,10 +1209,10 @@ def delete_agent(self, agent_id, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1222,7 +1221,7 @@ def delete_agent(self, agent_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1307,7 +1306,7 @@ def delete_connection(self, connection_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection got unknown kwargs: {extra_kwargs!r}") @@ -1316,10 +1315,10 @@ def delete_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1328,7 +1327,7 @@ def delete_connection(self, connection_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1413,7 +1412,7 @@ def delete_job(self, job_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_job got unknown kwargs: {extra_kwargs!r}") @@ -1422,10 +1421,10 @@ def delete_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1434,7 +1433,7 @@ def delete_job(self, job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1519,7 +1518,7 @@ def delete_migration(self, migration_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_migration got unknown kwargs: {extra_kwargs!r}") @@ -1528,10 +1527,10 @@ def delete_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1540,7 +1539,7 @@ def delete_migration(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1633,7 +1632,7 @@ def evaluate_migration(self, migration_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"evaluate_migration got unknown kwargs: {extra_kwargs!r}") @@ -1642,10 +1641,10 @@ def evaluate_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1655,7 +1654,7 @@ def evaluate_migration(self, migration_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1735,7 +1734,7 @@ def get_advisor_report(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_advisor_report got unknown kwargs: {extra_kwargs!r}") @@ -1744,10 +1743,10 @@ def get_advisor_report(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1755,7 +1754,7 @@ def get_advisor_report(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1834,7 +1833,7 @@ def get_agent(self, agent_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_agent got unknown kwargs: {extra_kwargs!r}") @@ -1843,10 +1842,10 @@ def get_agent(self, agent_id, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1854,7 +1853,7 @@ def get_agent(self, agent_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1933,7 +1932,7 @@ def get_connection(self, connection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection got unknown kwargs: {extra_kwargs!r}") @@ -1942,10 +1941,10 @@ def get_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1953,7 +1952,7 @@ def get_connection(self, connection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2032,7 +2031,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -2041,10 +2040,10 @@ def get_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2052,7 +2051,7 @@ def get_job(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2131,7 +2130,7 @@ def get_job_output_content(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_output_content got unknown kwargs: {extra_kwargs!r}") @@ -2140,10 +2139,10 @@ def get_job_output_content(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2151,7 +2150,7 @@ def get_job_output_content(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2238,7 +2237,7 @@ def get_migration(self, migration_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_migration got unknown kwargs: {extra_kwargs!r}") @@ -2247,10 +2246,10 @@ def get_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2259,7 +2258,7 @@ def get_migration(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2338,7 +2337,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2347,10 +2346,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2358,7 +2357,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2448,7 +2447,7 @@ def list_agent_images(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_agent_images got unknown kwargs: {extra_kwargs!r}") @@ -2465,14 +2464,14 @@ def list_agent_images(self, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2582,7 +2581,7 @@ def list_agents(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_agents got unknown kwargs: {extra_kwargs!r}") @@ -2617,14 +2616,14 @@ def list_agents(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2734,7 +2733,7 @@ def list_connections(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connections got unknown kwargs: {extra_kwargs!r}") @@ -2769,14 +2768,14 @@ def list_connections(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2907,7 +2906,7 @@ def list_excluded_objects(self, job_id, **kwargs): "reason_category", "source_rule" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_excluded_objects got unknown kwargs: {extra_kwargs!r}") @@ -2916,10 +2915,10 @@ def list_excluded_objects(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2956,14 +2955,14 @@ def list_excluded_objects(self, job_id, **kwargs): "reasonCategory": kwargs.get("reason_category", missing), "sourceRule": kwargs.get("source_rule", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3052,7 +3051,7 @@ def list_job_outputs(self, job_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_outputs got unknown kwargs: {extra_kwargs!r}") @@ -3061,24 +3060,24 @@ def list_job_outputs(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3191,7 +3190,7 @@ def list_jobs(self, migration_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -3226,14 +3225,14 @@ def list_jobs(self, migration_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3330,7 +3329,7 @@ def list_migration_object_types(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migration_object_types got unknown kwargs: {extra_kwargs!r}") @@ -3355,14 +3354,14 @@ def list_migration_object_types(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3457,7 +3456,7 @@ def list_migration_objects(self, migration_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migration_objects got unknown kwargs: {extra_kwargs!r}") @@ -3466,17 +3465,17 @@ def list_migration_objects(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3484,7 +3483,7 @@ def list_migration_objects(self, migration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3602,7 +3601,7 @@ def list_migrations(self, compartment_id, **kwargs): "lifecycle_state", "lifecycle_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_migrations got unknown kwargs: {extra_kwargs!r}") @@ -3645,14 +3644,14 @@ def list_migrations(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "lifecycleDetails": kwargs.get("lifecycle_details", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3751,7 +3750,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3760,10 +3759,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3786,14 +3785,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3894,7 +3893,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3903,10 +3902,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3929,14 +3928,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4049,7 +4048,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4084,14 +4083,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4181,7 +4180,7 @@ def remove_migration_objects(self, migration_id, remove_migration_objects_detail "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_migration_objects got unknown kwargs: {extra_kwargs!r}") @@ -4190,10 +4189,10 @@ def remove_migration_objects(self, migration_id, remove_migration_objects_detail "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4202,7 +4201,7 @@ def remove_migration_objects(self, migration_id, remove_migration_objects_detail "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4301,7 +4300,7 @@ def resume_job(self, job_id, **kwargs): "opc_request_id", "resume_job_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_job got unknown kwargs: {extra_kwargs!r}") @@ -4310,10 +4309,10 @@ def resume_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4323,7 +4322,7 @@ def resume_job(self, job_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4405,7 +4404,7 @@ def retrieve_supported_phases(self, migration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_supported_phases got unknown kwargs: {extra_kwargs!r}") @@ -4414,10 +4413,10 @@ def retrieve_supported_phases(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4425,7 +4424,7 @@ def retrieve_supported_phases(self, migration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4524,7 +4523,7 @@ def start_migration(self, migration_id, **kwargs): "opc_request_id", "start_migration_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_migration got unknown kwargs: {extra_kwargs!r}") @@ -4533,10 +4532,10 @@ def start_migration(self, migration_id, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4546,7 +4545,7 @@ def start_migration(self, migration_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4647,7 +4646,7 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_agent got unknown kwargs: {extra_kwargs!r}") @@ -4656,10 +4655,10 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "agentId": agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4669,7 +4668,7 @@ def update_agent(self, agent_id, update_agent_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4762,7 +4761,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connection got unknown kwargs: {extra_kwargs!r}") @@ -4771,10 +4770,10 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4783,7 +4782,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4873,7 +4872,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -4882,10 +4881,10 @@ def update_job(self, job_id, update_job_details, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4894,7 +4893,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4986,7 +4985,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_migration got unknown kwargs: {extra_kwargs!r}") @@ -4995,10 +4994,10 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "migrationId": migration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5007,7 +5006,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/database_tools/database_tools_client.py b/src/oci/database_tools/database_tools_client.py index d8a50a6c32..ed74334b47 100644 --- a/src/oci/database_tools/database_tools_client.py +++ b/src/oci/database_tools/database_tools_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def add_database_tools_connection_lock(self, database_tools_connection_id, add_r "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_database_tools_connection_lock got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def add_database_tools_connection_lock(self, database_tools_connection_id, add_r "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -191,7 +190,7 @@ def add_database_tools_connection_lock(self, database_tools_connection_id, add_r "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def add_database_tools_private_endpoint_lock(self, database_tools_private_endpoi "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_database_tools_private_endpoint_lock got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def add_database_tools_private_endpoint_lock(self, database_tools_private_endpoi "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -302,7 +301,7 @@ def add_database_tools_private_endpoint_lock(self, database_tools_private_endpoi "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -401,7 +400,7 @@ def change_database_tools_connection_compartment(self, database_tools_connection "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_tools_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -410,16 +409,16 @@ def change_database_tools_connection_compartment(self, database_tools_connection "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -427,7 +426,7 @@ def change_database_tools_connection_compartment(self, database_tools_connection "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -526,7 +525,7 @@ def change_database_tools_private_endpoint_compartment(self, database_tools_priv "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_tools_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -535,16 +534,16 @@ def change_database_tools_private_endpoint_compartment(self, database_tools_priv "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -552,7 +551,7 @@ def change_database_tools_private_endpoint_compartment(self, database_tools_priv "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -640,7 +639,7 @@ def create_database_tools_connection(self, create_database_tools_connection_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database_tools_connection got unknown kwargs: {extra_kwargs!r}") @@ -651,7 +650,7 @@ def create_database_tools_connection(self, create_database_tools_connection_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -740,7 +739,7 @@ def create_database_tools_private_endpoint(self, create_database_tools_private_e "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database_tools_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -751,7 +750,7 @@ def create_database_tools_private_endpoint(self, create_database_tools_private_e "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -844,7 +843,7 @@ def delete_database_tools_connection(self, database_tools_connection_id, **kwarg "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database_tools_connection got unknown kwargs: {extra_kwargs!r}") @@ -853,16 +852,16 @@ def delete_database_tools_connection(self, database_tools_connection_id, **kwarg "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -870,7 +869,7 @@ def delete_database_tools_connection(self, database_tools_connection_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -960,7 +959,7 @@ def delete_database_tools_private_endpoint(self, database_tools_private_endpoint "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database_tools_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -969,16 +968,16 @@ def delete_database_tools_private_endpoint(self, database_tools_private_endpoint "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -986,7 +985,7 @@ def delete_database_tools_private_endpoint(self, database_tools_private_endpoint "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1064,7 +1063,7 @@ def get_database_tools_connection(self, database_tools_connection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_tools_connection got unknown kwargs: {extra_kwargs!r}") @@ -1073,10 +1072,10 @@ def get_database_tools_connection(self, database_tools_connection_id, **kwargs): "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1084,7 +1083,7 @@ def get_database_tools_connection(self, database_tools_connection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1164,7 +1163,7 @@ def get_database_tools_endpoint_service(self, database_tools_endpoint_service_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_tools_endpoint_service got unknown kwargs: {extra_kwargs!r}") @@ -1173,10 +1172,10 @@ def get_database_tools_endpoint_service(self, database_tools_endpoint_service_id "databaseToolsEndpointServiceId": database_tools_endpoint_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1184,7 +1183,7 @@ def get_database_tools_endpoint_service(self, database_tools_endpoint_service_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1264,7 +1263,7 @@ def get_database_tools_private_endpoint(self, database_tools_private_endpoint_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_tools_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1273,10 +1272,10 @@ def get_database_tools_private_endpoint(self, database_tools_private_endpoint_id "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1284,7 +1283,7 @@ def get_database_tools_private_endpoint(self, database_tools_private_endpoint_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1362,7 +1361,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1371,10 +1370,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1382,7 +1381,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1506,7 +1505,7 @@ def list_database_tools_connections(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_tools_connections got unknown kwargs: {extra_kwargs!r}") @@ -1560,14 +1559,14 @@ def list_database_tools_connections(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1679,7 +1678,7 @@ def list_database_tools_endpoint_services(self, compartment_id, **kwargs): "display_name", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_tools_endpoint_services got unknown kwargs: {extra_kwargs!r}") @@ -1715,14 +1714,14 @@ def list_database_tools_endpoint_services(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1838,7 +1837,7 @@ def list_database_tools_private_endpoints(self, compartment_id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_tools_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -1875,14 +1874,14 @@ def list_database_tools_private_endpoints(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1980,7 +1979,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1989,10 +1988,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2015,14 +2014,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2122,7 +2121,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2131,10 +2130,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2157,14 +2156,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2270,7 +2269,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2297,14 +2296,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2394,7 +2393,7 @@ def remove_database_tools_connection_lock(self, database_tools_connection_id, re "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_database_tools_connection_lock got unknown kwargs: {extra_kwargs!r}") @@ -2403,10 +2402,10 @@ def remove_database_tools_connection_lock(self, database_tools_connection_id, re "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2415,7 +2414,7 @@ def remove_database_tools_connection_lock(self, database_tools_connection_id, re "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2505,7 +2504,7 @@ def remove_database_tools_private_endpoint_lock(self, database_tools_private_end "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_database_tools_private_endpoint_lock got unknown kwargs: {extra_kwargs!r}") @@ -2514,10 +2513,10 @@ def remove_database_tools_private_endpoint_lock(self, database_tools_private_end "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2526,7 +2525,7 @@ def remove_database_tools_private_endpoint_lock(self, database_tools_private_end "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2621,7 +2620,7 @@ def update_database_tools_connection(self, database_tools_connection_id, update_ "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_tools_connection got unknown kwargs: {extra_kwargs!r}") @@ -2630,16 +2629,16 @@ def update_database_tools_connection(self, database_tools_connection_id, update_ "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2647,7 +2646,7 @@ def update_database_tools_connection(self, database_tools_connection_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2742,7 +2741,7 @@ def update_database_tools_private_endpoint(self, database_tools_private_endpoint "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_tools_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2751,16 +2750,16 @@ def update_database_tools_private_endpoint(self, database_tools_private_endpoint "databaseToolsPrivateEndpointId": database_tools_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2768,7 +2767,7 @@ def update_database_tools_private_endpoint(self, database_tools_private_endpoint "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2859,7 +2858,7 @@ def validate_database_tools_connection(self, database_tools_connection_id, valid "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_database_tools_connection got unknown kwargs: {extra_kwargs!r}") @@ -2868,10 +2867,10 @@ def validate_database_tools_connection(self, database_tools_connection_id, valid "databaseToolsConnectionId": database_tools_connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2880,7 +2879,7 @@ def validate_database_tools_connection(self, database_tools_connection_id, valid "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/decorators.py b/src/oci/decorators.py index 083d0e58db..34596d4eef 100644 --- a/src/oci/decorators.py +++ b/src/oci/decorators.py @@ -6,7 +6,6 @@ from .util import Sentinel import functools -from oci._vendor import six missing = Sentinel("Missing") @@ -16,13 +15,13 @@ def wrap_init_to_set_state_from_kwargs(init_fn): @functools.wraps(init_fn) def init(self, **kwargs): init_fn(self) - for attr_name in six.iterkeys(self.swagger_types): + for attr_name in self.swagger_types.keys(): value = kwargs.pop(attr_name, missing) if value is not missing: setattr(self, attr_name, value) if kwargs: - raise TypeError('Unrecognized keyword arguments: {}'.format(', '.join(six.iterkeys(kwargs)))) + raise TypeError('Unrecognized keyword arguments: {}'.format(', '.join(kwargs.keys()))) return init diff --git a/src/oci/desktops/desktop_service_client.py b/src/oci/desktops/desktop_service_client.py index 312fa5dfa4..31a5a785a8 100644 --- a/src/oci/desktops/desktop_service_client.py +++ b/src/oci/desktops/desktop_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -171,10 +170,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -183,7 +182,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -270,7 +269,7 @@ def change_desktop_pool_compartment(self, desktop_pool_id, change_desktop_pool_c "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_desktop_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -279,10 +278,10 @@ def change_desktop_pool_compartment(self, desktop_pool_id, change_desktop_pool_c "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def change_desktop_pool_compartment(self, desktop_pool_id, change_desktop_pool_c "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -375,7 +374,7 @@ def create_desktop_pool(self, create_desktop_pool_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -386,7 +385,7 @@ def create_desktop_pool(self, create_desktop_pool_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -469,7 +468,7 @@ def delete_desktop(self, desktop_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_desktop got unknown kwargs: {extra_kwargs!r}") @@ -478,10 +477,10 @@ def delete_desktop(self, desktop_id, **kwargs): "desktopId": desktop_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -490,7 +489,7 @@ def delete_desktop(self, desktop_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -574,7 +573,7 @@ def delete_desktop_pool(self, desktop_pool_id, **kwargs): "if_match", "are_volumes_preserved" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -583,16 +582,16 @@ def delete_desktop_pool(self, desktop_pool_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "areVolumesPreserved": kwargs.get("are_volumes_preserved", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -600,7 +599,7 @@ def delete_desktop_pool(self, desktop_pool_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -678,7 +677,7 @@ def get_desktop(self, desktop_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_desktop got unknown kwargs: {extra_kwargs!r}") @@ -687,10 +686,10 @@ def get_desktop(self, desktop_id, **kwargs): "desktopId": desktop_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -698,7 +697,7 @@ def get_desktop(self, desktop_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -776,7 +775,7 @@ def get_desktop_pool(self, desktop_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def get_desktop_pool(self, desktop_pool_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -796,7 +795,7 @@ def get_desktop_pool(self, desktop_pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -874,7 +873,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -883,10 +882,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -894,7 +893,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1011,7 +1010,7 @@ def list_desktop_pool_desktops(self, compartment_id, desktop_pool_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_desktop_pool_desktops got unknown kwargs: {extra_kwargs!r}") @@ -1020,10 +1019,10 @@ def list_desktop_pool_desktops(self, compartment_id, desktop_pool_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1051,14 +1050,14 @@ def list_desktop_pool_desktops(self, compartment_id, desktop_pool_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1177,7 +1176,7 @@ def list_desktop_pool_volumes(self, desktop_pool_id, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_desktop_pool_volumes got unknown kwargs: {extra_kwargs!r}") @@ -1186,10 +1185,10 @@ def list_desktop_pool_volumes(self, desktop_pool_id, compartment_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1217,14 +1216,14 @@ def list_desktop_pool_volumes(self, desktop_pool_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1340,7 +1339,7 @@ def list_desktop_pools(self, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_desktop_pools got unknown kwargs: {extra_kwargs!r}") @@ -1370,14 +1369,14 @@ def list_desktop_pools(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1495,7 +1494,7 @@ def list_desktops(self, compartment_id, **kwargs): "page", "desktop_pool_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_desktops got unknown kwargs: {extra_kwargs!r}") @@ -1526,14 +1525,14 @@ def list_desktops(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "desktopPoolId": kwargs.get("desktop_pool_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1631,7 +1630,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1640,10 +1639,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1666,14 +1665,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1773,7 +1772,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1782,10 +1781,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1808,14 +1807,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1929,7 +1928,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1965,14 +1964,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2058,7 +2057,7 @@ def start_desktop(self, desktop_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_desktop got unknown kwargs: {extra_kwargs!r}") @@ -2067,10 +2066,10 @@ def start_desktop(self, desktop_id, **kwargs): "desktopId": desktop_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2080,7 +2079,7 @@ def start_desktop(self, desktop_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2165,7 +2164,7 @@ def start_desktop_pool(self, desktop_pool_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -2174,10 +2173,10 @@ def start_desktop_pool(self, desktop_pool_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2187,7 +2186,7 @@ def start_desktop_pool(self, desktop_pool_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2272,7 +2271,7 @@ def stop_desktop(self, desktop_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_desktop got unknown kwargs: {extra_kwargs!r}") @@ -2281,10 +2280,10 @@ def stop_desktop(self, desktop_id, **kwargs): "desktopId": desktop_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2294,7 +2293,7 @@ def stop_desktop(self, desktop_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2379,7 +2378,7 @@ def stop_desktop_pool(self, desktop_pool_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -2388,10 +2387,10 @@ def stop_desktop_pool(self, desktop_pool_id, **kwargs): "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2401,7 +2400,7 @@ def stop_desktop_pool(self, desktop_pool_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2485,7 +2484,7 @@ def update_desktop(self, desktop_id, update_desktop_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_desktop got unknown kwargs: {extra_kwargs!r}") @@ -2494,10 +2493,10 @@ def update_desktop(self, desktop_id, update_desktop_details, **kwargs): "desktopId": desktop_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2506,7 +2505,7 @@ def update_desktop(self, desktop_id, update_desktop_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2591,7 +2590,7 @@ def update_desktop_pool(self, desktop_pool_id, update_desktop_pool_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_desktop_pool got unknown kwargs: {extra_kwargs!r}") @@ -2600,10 +2599,10 @@ def update_desktop_pool(self, desktop_pool_id, update_desktop_pool_details, **kw "desktopPoolId": desktop_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2612,7 +2611,7 @@ def update_desktop_pool(self, desktop_pool_id, update_desktop_pool_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/devops/devops_client.py b/src/oci/devops/devops_client.py index 05d3d0d96a..4bf99a9be3 100644 --- a/src/oci/devops/devops_client.py +++ b/src/oci/devops/devops_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def approve_deployment(self, deployment_id, approve_deployment_details, **kwargs "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"approve_deployment got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def approve_deployment(self, deployment_id, approve_deployment_details, **kwargs "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -191,7 +190,7 @@ def approve_deployment(self, deployment_id, approve_deployment_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -283,7 +282,7 @@ def cancel_build_run(self, cancel_build_run_details, build_run_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_build_run got unknown kwargs: {extra_kwargs!r}") @@ -292,10 +291,10 @@ def cancel_build_run(self, cancel_build_run_details, build_run_id, **kwargs): "buildRunId": build_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -305,7 +304,7 @@ def cancel_build_run(self, cancel_build_run_details, build_run_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -397,7 +396,7 @@ def cancel_deployment(self, deployment_id, cancel_deployment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_deployment got unknown kwargs: {extra_kwargs!r}") @@ -406,10 +405,10 @@ def cancel_deployment(self, deployment_id, cancel_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -419,7 +418,7 @@ def cancel_deployment(self, deployment_id, cancel_deployment_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -508,7 +507,7 @@ def cancel_scheduled_cascading_project_deletion(self, project_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_scheduled_cascading_project_deletion got unknown kwargs: {extra_kwargs!r}") @@ -517,10 +516,10 @@ def cancel_scheduled_cascading_project_deletion(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def cancel_scheduled_cascading_project_deletion(self, project_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -627,10 +626,10 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -640,7 +639,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -723,7 +722,7 @@ def create_build_pipeline(self, create_build_pipeline_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_build_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -734,7 +733,7 @@ def create_build_pipeline(self, create_build_pipeline_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -817,7 +816,7 @@ def create_build_pipeline_stage(self, create_build_pipeline_stage_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_build_pipeline_stage got unknown kwargs: {extra_kwargs!r}") @@ -828,7 +827,7 @@ def create_build_pipeline_stage(self, create_build_pipeline_stage_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -915,7 +914,7 @@ def create_build_run(self, create_build_run_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_build_run got unknown kwargs: {extra_kwargs!r}") @@ -927,7 +926,7 @@ def create_build_run(self, create_build_run_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1010,7 +1009,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection got unknown kwargs: {extra_kwargs!r}") @@ -1021,7 +1020,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1104,7 +1103,7 @@ def create_deploy_artifact(self, create_deploy_artifact_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deploy_artifact got unknown kwargs: {extra_kwargs!r}") @@ -1115,7 +1114,7 @@ def create_deploy_artifact(self, create_deploy_artifact_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1198,7 +1197,7 @@ def create_deploy_environment(self, create_deploy_environment_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deploy_environment got unknown kwargs: {extra_kwargs!r}") @@ -1209,7 +1208,7 @@ def create_deploy_environment(self, create_deploy_environment_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1292,7 +1291,7 @@ def create_deploy_pipeline(self, create_deploy_pipeline_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deploy_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -1303,7 +1302,7 @@ def create_deploy_pipeline(self, create_deploy_pipeline_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1386,7 +1385,7 @@ def create_deploy_stage(self, create_deploy_stage_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deploy_stage got unknown kwargs: {extra_kwargs!r}") @@ -1397,7 +1396,7 @@ def create_deploy_stage(self, create_deploy_stage_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1480,7 +1479,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deployment got unknown kwargs: {extra_kwargs!r}") @@ -1491,7 +1490,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1574,7 +1573,7 @@ def create_project(self, create_project_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_project got unknown kwargs: {extra_kwargs!r}") @@ -1585,7 +1584,7 @@ def create_project(self, create_project_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1668,7 +1667,7 @@ def create_repository(self, create_repository_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_repository got unknown kwargs: {extra_kwargs!r}") @@ -1679,7 +1678,7 @@ def create_repository(self, create_repository_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1762,7 +1761,7 @@ def create_trigger(self, create_trigger_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_trigger got unknown kwargs: {extra_kwargs!r}") @@ -1773,7 +1772,7 @@ def create_trigger(self, create_trigger_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1856,7 +1855,7 @@ def delete_build_pipeline(self, build_pipeline_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_build_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -1865,10 +1864,10 @@ def delete_build_pipeline(self, build_pipeline_id, **kwargs): "buildPipelineId": build_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1877,7 +1876,7 @@ def delete_build_pipeline(self, build_pipeline_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1957,7 +1956,7 @@ def delete_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_build_pipeline_stage got unknown kwargs: {extra_kwargs!r}") @@ -1966,10 +1965,10 @@ def delete_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "buildPipelineStageId": build_pipeline_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1978,7 +1977,7 @@ def delete_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2058,7 +2057,7 @@ def delete_connection(self, connection_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection got unknown kwargs: {extra_kwargs!r}") @@ -2067,10 +2066,10 @@ def delete_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2079,7 +2078,7 @@ def delete_connection(self, connection_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2159,7 +2158,7 @@ def delete_deploy_artifact(self, deploy_artifact_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deploy_artifact got unknown kwargs: {extra_kwargs!r}") @@ -2168,10 +2167,10 @@ def delete_deploy_artifact(self, deploy_artifact_id, **kwargs): "deployArtifactId": deploy_artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2180,7 +2179,7 @@ def delete_deploy_artifact(self, deploy_artifact_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2260,7 +2259,7 @@ def delete_deploy_environment(self, deploy_environment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deploy_environment got unknown kwargs: {extra_kwargs!r}") @@ -2269,10 +2268,10 @@ def delete_deploy_environment(self, deploy_environment_id, **kwargs): "deployEnvironmentId": deploy_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2281,7 +2280,7 @@ def delete_deploy_environment(self, deploy_environment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2361,7 +2360,7 @@ def delete_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deploy_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -2370,10 +2369,10 @@ def delete_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "deployPipelineId": deploy_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2382,7 +2381,7 @@ def delete_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2462,7 +2461,7 @@ def delete_deploy_stage(self, deploy_stage_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deploy_stage got unknown kwargs: {extra_kwargs!r}") @@ -2471,10 +2470,10 @@ def delete_deploy_stage(self, deploy_stage_id, **kwargs): "deployStageId": deploy_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2483,7 +2482,7 @@ def delete_deploy_stage(self, deploy_stage_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2563,7 +2562,7 @@ def delete_project(self, project_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_project got unknown kwargs: {extra_kwargs!r}") @@ -2572,10 +2571,10 @@ def delete_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2584,7 +2583,7 @@ def delete_project(self, project_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2671,7 +2670,7 @@ def delete_ref(self, repository_id, ref_name, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ref got unknown kwargs: {extra_kwargs!r}") @@ -2681,10 +2680,10 @@ def delete_ref(self, repository_id, ref_name, **kwargs): "refName": ref_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2694,7 +2693,7 @@ def delete_ref(self, repository_id, ref_name, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2775,7 +2774,7 @@ def delete_repository(self, repository_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_repository got unknown kwargs: {extra_kwargs!r}") @@ -2784,10 +2783,10 @@ def delete_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2796,7 +2795,7 @@ def delete_repository(self, repository_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2876,7 +2875,7 @@ def delete_trigger(self, trigger_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_trigger got unknown kwargs: {extra_kwargs!r}") @@ -2885,10 +2884,10 @@ def delete_trigger(self, trigger_id, **kwargs): "triggerId": trigger_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2897,7 +2896,7 @@ def delete_trigger(self, trigger_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2973,7 +2972,7 @@ def get_build_pipeline(self, build_pipeline_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_build_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -2982,10 +2981,10 @@ def get_build_pipeline(self, build_pipeline_id, **kwargs): "buildPipelineId": build_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2993,7 +2992,7 @@ def get_build_pipeline(self, build_pipeline_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3071,7 +3070,7 @@ def get_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_build_pipeline_stage got unknown kwargs: {extra_kwargs!r}") @@ -3080,10 +3079,10 @@ def get_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "buildPipelineStageId": build_pipeline_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3091,7 +3090,7 @@ def get_build_pipeline_stage(self, build_pipeline_stage_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3169,7 +3168,7 @@ def get_build_run(self, build_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_build_run got unknown kwargs: {extra_kwargs!r}") @@ -3178,10 +3177,10 @@ def get_build_run(self, build_run_id, **kwargs): "buildRunId": build_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3189,7 +3188,7 @@ def get_build_run(self, build_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3270,7 +3269,7 @@ def get_commit(self, repository_id, commit_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_commit got unknown kwargs: {extra_kwargs!r}") @@ -3280,10 +3279,10 @@ def get_commit(self, repository_id, commit_id, **kwargs): "commitId": commit_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3291,7 +3290,7 @@ def get_commit(self, repository_id, commit_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3380,7 +3379,7 @@ def get_commit_diff(self, repository_id, target_version, **kwargs): "is_comparison_from_merge_base", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_commit_diff got unknown kwargs: {extra_kwargs!r}") @@ -3389,10 +3388,10 @@ def get_commit_diff(self, repository_id, target_version, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3400,14 +3399,14 @@ def get_commit_diff(self, repository_id, target_version, **kwargs): "targetVersion": target_version, "isComparisonFromMergeBase": kwargs.get("is_comparison_from_merge_base", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3487,7 +3486,7 @@ def get_connection(self, connection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection got unknown kwargs: {extra_kwargs!r}") @@ -3496,10 +3495,10 @@ def get_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3507,7 +3506,7 @@ def get_connection(self, connection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3585,7 +3584,7 @@ def get_deploy_artifact(self, deploy_artifact_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deploy_artifact got unknown kwargs: {extra_kwargs!r}") @@ -3594,10 +3593,10 @@ def get_deploy_artifact(self, deploy_artifact_id, **kwargs): "deployArtifactId": deploy_artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3605,7 +3604,7 @@ def get_deploy_artifact(self, deploy_artifact_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3683,7 +3682,7 @@ def get_deploy_environment(self, deploy_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deploy_environment got unknown kwargs: {extra_kwargs!r}") @@ -3692,10 +3691,10 @@ def get_deploy_environment(self, deploy_environment_id, **kwargs): "deployEnvironmentId": deploy_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3703,7 +3702,7 @@ def get_deploy_environment(self, deploy_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3781,7 +3780,7 @@ def get_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deploy_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -3790,10 +3789,10 @@ def get_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "deployPipelineId": deploy_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3801,7 +3800,7 @@ def get_deploy_pipeline(self, deploy_pipeline_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3879,7 +3878,7 @@ def get_deploy_stage(self, deploy_stage_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deploy_stage got unknown kwargs: {extra_kwargs!r}") @@ -3888,10 +3887,10 @@ def get_deploy_stage(self, deploy_stage_id, **kwargs): "deployStageId": deploy_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3899,7 +3898,7 @@ def get_deploy_stage(self, deploy_stage_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3977,7 +3976,7 @@ def get_deployment(self, deployment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deployment got unknown kwargs: {extra_kwargs!r}") @@ -3986,10 +3985,10 @@ def get_deployment(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3997,7 +3996,7 @@ def get_deployment(self, deployment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4088,7 +4087,7 @@ def get_file_diff(self, repository_id, file_path, base_version, target_version, "is_comparison_from_merge_base", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_file_diff got unknown kwargs: {extra_kwargs!r}") @@ -4098,10 +4097,10 @@ def get_file_diff(self, repository_id, file_path, base_version, target_version, "filePath": file_path } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4109,14 +4108,14 @@ def get_file_diff(self, repository_id, file_path, base_version, target_version, "targetVersion": target_version, "isComparisonFromMergeBase": kwargs.get("is_comparison_from_merge_base", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4203,7 +4202,7 @@ def get_mirror_record(self, repository_id, mirror_record_type, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mirror_record got unknown kwargs: {extra_kwargs!r}") @@ -4213,10 +4212,10 @@ def get_mirror_record(self, repository_id, mirror_record_type, **kwargs): "mirrorRecordType": mirror_record_type } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4224,7 +4223,7 @@ def get_mirror_record(self, repository_id, mirror_record_type, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4310,7 +4309,7 @@ def get_object(self, repository_id, **kwargs): "ref_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_object got unknown kwargs: {extra_kwargs!r}") @@ -4319,24 +4318,24 @@ def get_object(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "filePath": kwargs.get("file_path", missing), "refName": kwargs.get("ref_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4423,7 +4422,7 @@ def get_object_content(self, repository_id, sha, **kwargs): "file_path", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_object_content got unknown kwargs: {extra_kwargs!r}") @@ -4433,23 +4432,23 @@ def get_object_content(self, repository_id, sha, **kwargs): "sha": sha } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "filePath": kwargs.get("file_path", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4529,7 +4528,7 @@ def get_project(self, project_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_project got unknown kwargs: {extra_kwargs!r}") @@ -4538,10 +4537,10 @@ def get_project(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4549,7 +4548,7 @@ def get_project(self, project_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4630,7 +4629,7 @@ def get_ref(self, repository_id, ref_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ref got unknown kwargs: {extra_kwargs!r}") @@ -4640,10 +4639,10 @@ def get_ref(self, repository_id, ref_name, **kwargs): "refName": ref_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4651,7 +4650,7 @@ def get_ref(self, repository_id, ref_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4743,7 +4742,7 @@ def get_repo_file_diff(self, repository_id, base_version, target_version, **kwar "is_comparison_from_merge_base", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repo_file_diff got unknown kwargs: {extra_kwargs!r}") @@ -4752,10 +4751,10 @@ def get_repo_file_diff(self, repository_id, base_version, target_version, **kwar "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4764,14 +4763,14 @@ def get_repo_file_diff(self, repository_id, base_version, target_version, **kwar "targetVersion": target_version, "isComparisonFromMergeBase": kwargs.get("is_comparison_from_merge_base", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4866,7 +4865,7 @@ def get_repo_file_lines(self, repository_id, revision, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repo_file_lines got unknown kwargs: {extra_kwargs!r}") @@ -4875,10 +4874,10 @@ def get_repo_file_lines(self, repository_id, revision, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4887,14 +4886,14 @@ def get_repo_file_lines(self, repository_id, revision, **kwargs): "startLineNumber": kwargs.get("start_line_number", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4980,7 +4979,7 @@ def get_repository(self, repository_id, **kwargs): "opc_request_id", "fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repository got unknown kwargs: {extra_kwargs!r}") @@ -4989,10 +4988,10 @@ def get_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -5006,14 +5005,14 @@ def get_repository(self, repository_id, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5101,7 +5100,7 @@ def get_repository_archive_content(self, repository_id, **kwargs): "format", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repository_archive_content got unknown kwargs: {extra_kwargs!r}") @@ -5110,24 +5109,24 @@ def get_repository_archive_content(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "refName": kwargs.get("ref_name", missing), "format": kwargs.get("format", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5221,7 +5220,7 @@ def get_repository_file_lines(self, repository_id, file_path, revision, **kwargs "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_repository_file_lines got unknown kwargs: {extra_kwargs!r}") @@ -5231,10 +5230,10 @@ def get_repository_file_lines(self, repository_id, file_path, revision, **kwargs "filePath": file_path } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -5242,14 +5241,14 @@ def get_repository_file_lines(self, repository_id, file_path, revision, **kwargs "startLineNumber": kwargs.get("start_line_number", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5329,7 +5328,7 @@ def get_trigger(self, trigger_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_trigger got unknown kwargs: {extra_kwargs!r}") @@ -5338,10 +5337,10 @@ def get_trigger(self, trigger_id, **kwargs): "triggerId": trigger_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5349,7 +5348,7 @@ def get_trigger(self, trigger_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5427,7 +5426,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -5436,10 +5435,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5447,7 +5446,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5543,7 +5542,7 @@ def list_authors(self, repository_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_authors got unknown kwargs: {extra_kwargs!r}") @@ -5552,10 +5551,10 @@ def list_authors(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5571,14 +5570,14 @@ def list_authors(self, repository_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5697,7 +5696,7 @@ def list_build_pipeline_stages(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_build_pipeline_stages got unknown kwargs: {extra_kwargs!r}") @@ -5734,14 +5733,14 @@ def list_build_pipeline_stages(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5858,7 +5857,7 @@ def list_build_pipelines(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_build_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -5895,14 +5894,14 @@ def list_build_pipelines(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6023,7 +6022,7 @@ def list_build_runs(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_build_runs got unknown kwargs: {extra_kwargs!r}") @@ -6061,14 +6060,14 @@ def list_build_runs(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6164,7 +6163,7 @@ def list_commit_diffs(self, repository_id, base_version, target_version, **kwarg "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_commit_diffs got unknown kwargs: {extra_kwargs!r}") @@ -6173,10 +6172,10 @@ def list_commit_diffs(self, repository_id, base_version, target_version, **kwarg "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -6186,14 +6185,14 @@ def list_commit_diffs(self, repository_id, base_version, target_version, **kwarg "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6309,7 +6308,7 @@ def list_commits(self, repository_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_commits got unknown kwargs: {extra_kwargs!r}") @@ -6318,10 +6317,10 @@ def list_commits(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -6335,14 +6334,14 @@ def list_commits(self, repository_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6467,7 +6466,7 @@ def list_connections(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connections got unknown kwargs: {extra_kwargs!r}") @@ -6512,14 +6511,14 @@ def list_connections(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6636,7 +6635,7 @@ def list_deploy_artifacts(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deploy_artifacts got unknown kwargs: {extra_kwargs!r}") @@ -6673,14 +6672,14 @@ def list_deploy_artifacts(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6797,7 +6796,7 @@ def list_deploy_environments(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deploy_environments got unknown kwargs: {extra_kwargs!r}") @@ -6834,14 +6833,14 @@ def list_deploy_environments(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6958,7 +6957,7 @@ def list_deploy_pipelines(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deploy_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -6995,14 +6994,14 @@ def list_deploy_pipelines(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7119,7 +7118,7 @@ def list_deploy_stages(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deploy_stages got unknown kwargs: {extra_kwargs!r}") @@ -7156,14 +7155,14 @@ def list_deploy_stages(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7296,7 +7295,7 @@ def list_deployments(self, **kwargs): "time_created_less_than", "time_created_greater_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployments got unknown kwargs: {extra_kwargs!r}") @@ -7336,14 +7335,14 @@ def list_deployments(self, **kwargs): "timeCreatedLessThan": kwargs.get("time_created_less_than", missing), "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7435,7 +7434,7 @@ def list_mirror_records(self, repository_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_mirror_records got unknown kwargs: {extra_kwargs!r}") @@ -7444,10 +7443,10 @@ def list_mirror_records(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7462,14 +7461,14 @@ def list_mirror_records(self, repository_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7586,7 +7585,7 @@ def list_paths(self, repository_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_paths got unknown kwargs: {extra_kwargs!r}") @@ -7595,10 +7594,10 @@ def list_paths(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7625,14 +7624,14 @@ def list_paths(self, repository_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7746,7 +7745,7 @@ def list_projects(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_projects got unknown kwargs: {extra_kwargs!r}") @@ -7782,14 +7781,14 @@ def list_projects(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7901,7 +7900,7 @@ def list_refs(self, repository_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_refs got unknown kwargs: {extra_kwargs!r}") @@ -7910,10 +7909,10 @@ def list_refs(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'ref_type' in kwargs: @@ -7946,14 +7945,14 @@ def list_refs(self, repository_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8072,7 +8071,7 @@ def list_repositories(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_repositories got unknown kwargs: {extra_kwargs!r}") @@ -8109,14 +8108,14 @@ def list_repositories(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8233,7 +8232,7 @@ def list_triggers(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_triggers got unknown kwargs: {extra_kwargs!r}") @@ -8270,14 +8269,14 @@ def list_triggers(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8375,7 +8374,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -8384,10 +8383,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8410,14 +8409,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8517,7 +8516,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -8526,10 +8525,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8552,14 +8551,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8677,7 +8676,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "operation_type_multi_value_query" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -8714,14 +8713,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "operationTypeMultiValueQuery": self.base_client.generate_collection_format_param(kwargs.get("operation_type_multi_value_query", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8803,7 +8802,7 @@ def mirror_repository(self, repository_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"mirror_repository got unknown kwargs: {extra_kwargs!r}") @@ -8812,10 +8811,10 @@ def mirror_repository(self, repository_id, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8824,7 +8823,7 @@ def mirror_repository(self, repository_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8914,7 +8913,7 @@ def put_repository_ref(self, repository_id, ref_name, put_repository_ref_details "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_repository_ref got unknown kwargs: {extra_kwargs!r}") @@ -8924,10 +8923,10 @@ def put_repository_ref(self, repository_id, ref_name, put_repository_ref_details "refName": ref_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8937,7 +8936,7 @@ def put_repository_ref(self, repository_id, ref_name, put_repository_ref_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9026,7 +9025,7 @@ def schedule_cascading_project_deletion(self, project_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_cascading_project_deletion got unknown kwargs: {extra_kwargs!r}") @@ -9035,10 +9034,10 @@ def schedule_cascading_project_deletion(self, project_id, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9048,7 +9047,7 @@ def schedule_cascading_project_deletion(self, project_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9132,7 +9131,7 @@ def update_build_pipeline(self, build_pipeline_id, update_build_pipeline_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_build_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -9141,10 +9140,10 @@ def update_build_pipeline(self, build_pipeline_id, update_build_pipeline_details "buildPipelineId": build_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9153,7 +9152,7 @@ def update_build_pipeline(self, build_pipeline_id, update_build_pipeline_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9240,7 +9239,7 @@ def update_build_pipeline_stage(self, build_pipeline_stage_id, update_build_pipe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_build_pipeline_stage got unknown kwargs: {extra_kwargs!r}") @@ -9249,10 +9248,10 @@ def update_build_pipeline_stage(self, build_pipeline_stage_id, update_build_pipe "buildPipelineStageId": build_pipeline_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9261,7 +9260,7 @@ def update_build_pipeline_stage(self, build_pipeline_stage_id, update_build_pipe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9348,7 +9347,7 @@ def update_build_run(self, build_run_id, update_build_run_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_build_run got unknown kwargs: {extra_kwargs!r}") @@ -9357,10 +9356,10 @@ def update_build_run(self, build_run_id, update_build_run_details, **kwargs): "buildRunId": build_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9369,7 +9368,7 @@ def update_build_run(self, build_run_id, update_build_run_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9456,7 +9455,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connection got unknown kwargs: {extra_kwargs!r}") @@ -9465,10 +9464,10 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9477,7 +9476,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9564,7 +9563,7 @@ def update_deploy_artifact(self, deploy_artifact_id, update_deploy_artifact_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deploy_artifact got unknown kwargs: {extra_kwargs!r}") @@ -9573,10 +9572,10 @@ def update_deploy_artifact(self, deploy_artifact_id, update_deploy_artifact_deta "deployArtifactId": deploy_artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9585,7 +9584,7 @@ def update_deploy_artifact(self, deploy_artifact_id, update_deploy_artifact_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9672,7 +9671,7 @@ def update_deploy_environment(self, deploy_environment_id, update_deploy_environ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deploy_environment got unknown kwargs: {extra_kwargs!r}") @@ -9681,10 +9680,10 @@ def update_deploy_environment(self, deploy_environment_id, update_deploy_environ "deployEnvironmentId": deploy_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9693,7 +9692,7 @@ def update_deploy_environment(self, deploy_environment_id, update_deploy_environ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9780,7 +9779,7 @@ def update_deploy_pipeline(self, deploy_pipeline_id, update_deploy_pipeline_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deploy_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -9789,10 +9788,10 @@ def update_deploy_pipeline(self, deploy_pipeline_id, update_deploy_pipeline_deta "deployPipelineId": deploy_pipeline_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9801,7 +9800,7 @@ def update_deploy_pipeline(self, deploy_pipeline_id, update_deploy_pipeline_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9888,7 +9887,7 @@ def update_deploy_stage(self, deploy_stage_id, update_deploy_stage_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deploy_stage got unknown kwargs: {extra_kwargs!r}") @@ -9897,10 +9896,10 @@ def update_deploy_stage(self, deploy_stage_id, update_deploy_stage_details, **kw "deployStageId": deploy_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9909,7 +9908,7 @@ def update_deploy_stage(self, deploy_stage_id, update_deploy_stage_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9996,7 +9995,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deployment got unknown kwargs: {extra_kwargs!r}") @@ -10005,10 +10004,10 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10017,7 +10016,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10104,7 +10103,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_project got unknown kwargs: {extra_kwargs!r}") @@ -10113,10 +10112,10 @@ def update_project(self, project_id, update_project_details, **kwargs): "projectId": project_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10125,7 +10124,7 @@ def update_project(self, project_id, update_project_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10212,7 +10211,7 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_repository got unknown kwargs: {extra_kwargs!r}") @@ -10221,10 +10220,10 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "repositoryId": repository_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10233,7 +10232,7 @@ def update_repository(self, repository_id, update_repository_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10320,7 +10319,7 @@ def update_trigger(self, trigger_id, update_trigger_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_trigger got unknown kwargs: {extra_kwargs!r}") @@ -10329,10 +10328,10 @@ def update_trigger(self, trigger_id, update_trigger_details, **kwargs): "triggerId": trigger_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10341,7 +10340,7 @@ def update_trigger(self, trigger_id, update_trigger_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10429,7 +10428,7 @@ def validate_connection(self, connection_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_connection got unknown kwargs: {extra_kwargs!r}") @@ -10438,10 +10437,10 @@ def validate_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10451,7 +10450,7 @@ def validate_connection(self, connection_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/disaster_recovery/disaster_recovery_client.py b/src/oci/disaster_recovery/disaster_recovery_client.py index 561fc93405..91c07562eb 100644 --- a/src/oci/disaster_recovery/disaster_recovery_client.py +++ b/src/oci/disaster_recovery/disaster_recovery_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -183,7 +182,7 @@ def associate_dr_protection_group(self, associate_dr_protection_group_details, d "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"associate_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def associate_dr_protection_group(self, associate_dr_protection_group_details, d "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -205,7 +204,7 @@ def associate_dr_protection_group(self, associate_dr_protection_group_details, d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -305,7 +304,7 @@ def cancel_dr_plan_execution(self, cancel_dr_plan_execution_details, dr_plan_exe "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -314,10 +313,10 @@ def cancel_dr_plan_execution(self, cancel_dr_plan_execution_details, dr_plan_exe "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -327,7 +326,7 @@ def cancel_dr_plan_execution(self, cancel_dr_plan_execution_details, dr_plan_exe "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -416,7 +415,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -425,10 +424,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -437,7 +436,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -534,7 +533,7 @@ def change_dr_protection_group_compartment(self, change_dr_protection_group_comp "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dr_protection_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -543,10 +542,10 @@ def change_dr_protection_group_compartment(self, change_dr_protection_group_comp "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -556,7 +555,7 @@ def change_dr_protection_group_compartment(self, change_dr_protection_group_comp "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -643,7 +642,7 @@ def create_dr_plan(self, create_dr_plan_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -654,7 +653,7 @@ def create_dr_plan(self, create_dr_plan_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -741,7 +740,7 @@ def create_dr_plan_execution(self, create_dr_plan_execution_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -752,7 +751,7 @@ def create_dr_plan_execution(self, create_dr_plan_execution_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -839,7 +838,7 @@ def create_dr_protection_group(self, create_dr_protection_group_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -850,7 +849,7 @@ def create_dr_protection_group(self, create_dr_protection_group_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -939,7 +938,7 @@ def delete_dr_plan(self, dr_plan_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -948,10 +947,10 @@ def delete_dr_plan(self, dr_plan_id, **kwargs): "drPlanId": dr_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -960,7 +959,7 @@ def delete_dr_plan(self, dr_plan_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1046,7 +1045,7 @@ def delete_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -1055,10 +1054,10 @@ def delete_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1067,7 +1066,7 @@ def delete_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1153,7 +1152,7 @@ def delete_dr_protection_group(self, dr_protection_group_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def delete_dr_protection_group(self, dr_protection_group_id, **kwargs): "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1174,7 +1173,7 @@ def delete_dr_protection_group(self, dr_protection_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1272,7 +1271,7 @@ def disassociate_dr_protection_group(self, disassociate_dr_protection_group_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disassociate_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -1281,10 +1280,10 @@ def disassociate_dr_protection_group(self, disassociate_dr_protection_group_deta "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1294,7 +1293,7 @@ def disassociate_dr_protection_group(self, disassociate_dr_protection_group_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1375,7 +1374,7 @@ def get_dr_plan(self, dr_plan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -1384,10 +1383,10 @@ def get_dr_plan(self, dr_plan_id, **kwargs): "drPlanId": dr_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1395,7 +1394,7 @@ def get_dr_plan(self, dr_plan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1475,7 +1474,7 @@ def get_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -1484,10 +1483,10 @@ def get_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1495,7 +1494,7 @@ def get_dr_plan_execution(self, dr_plan_execution_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1575,7 +1574,7 @@ def get_dr_protection_group(self, dr_protection_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -1584,10 +1583,10 @@ def get_dr_protection_group(self, dr_protection_group_id, **kwargs): "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1595,7 +1594,7 @@ def get_dr_protection_group(self, dr_protection_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1675,7 +1674,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1684,10 +1683,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1695,7 +1694,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1794,7 +1793,7 @@ def ignore_dr_plan_execution(self, ignore_dr_plan_execution_details, dr_plan_exe "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ignore_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -1803,10 +1802,10 @@ def ignore_dr_plan_execution(self, ignore_dr_plan_execution_details, dr_plan_exe "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1816,7 +1815,7 @@ def ignore_dr_plan_execution(self, ignore_dr_plan_execution_details, dr_plan_exe "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1959,7 +1958,7 @@ def list_dr_plan_executions(self, dr_protection_group_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dr_plan_executions got unknown kwargs: {extra_kwargs!r}") @@ -2003,14 +2002,14 @@ def list_dr_plan_executions(self, dr_protection_group_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2152,7 +2151,7 @@ def list_dr_plans(self, dr_protection_group_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dr_plans got unknown kwargs: {extra_kwargs!r}") @@ -2196,14 +2195,14 @@ def list_dr_plans(self, dr_protection_group_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2351,7 +2350,7 @@ def list_dr_protection_groups(self, compartment_id, **kwargs): "role", "lifecycle_sub_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dr_protection_groups got unknown kwargs: {extra_kwargs!r}") @@ -2403,14 +2402,14 @@ def list_dr_protection_groups(self, compartment_id, **kwargs): "role": kwargs.get("role", missing), "lifecycleSubState": kwargs.get("lifecycle_sub_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2526,7 +2525,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2535,10 +2534,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2561,14 +2560,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2686,7 +2685,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2695,10 +2694,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2721,14 +2720,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2865,7 +2864,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2901,14 +2900,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3007,7 +3006,7 @@ def pause_dr_plan_execution(self, pause_dr_plan_execution_details, dr_plan_execu "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"pause_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -3016,10 +3015,10 @@ def pause_dr_plan_execution(self, pause_dr_plan_execution_details, dr_plan_execu "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3029,7 +3028,7 @@ def pause_dr_plan_execution(self, pause_dr_plan_execution_details, dr_plan_execu "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3129,7 +3128,7 @@ def resume_dr_plan_execution(self, resume_dr_plan_execution_details, dr_plan_exe "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -3138,10 +3137,10 @@ def resume_dr_plan_execution(self, resume_dr_plan_execution_details, dr_plan_exe "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3151,7 +3150,7 @@ def resume_dr_plan_execution(self, resume_dr_plan_execution_details, dr_plan_exe "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3251,7 +3250,7 @@ def retry_dr_plan_execution(self, retry_dr_plan_execution_details, dr_plan_execu "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retry_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -3260,10 +3259,10 @@ def retry_dr_plan_execution(self, retry_dr_plan_execution_details, dr_plan_execu "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3273,7 +3272,7 @@ def retry_dr_plan_execution(self, retry_dr_plan_execution_details, dr_plan_execu "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3365,7 +3364,7 @@ def update_dr_plan(self, update_dr_plan_details, dr_plan_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -3374,10 +3373,10 @@ def update_dr_plan(self, update_dr_plan_details, dr_plan_id, **kwargs): "drPlanId": dr_plan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3386,7 +3385,7 @@ def update_dr_plan(self, update_dr_plan_details, dr_plan_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3477,7 +3476,7 @@ def update_dr_plan_execution(self, update_dr_plan_execution_details, dr_plan_exe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dr_plan_execution got unknown kwargs: {extra_kwargs!r}") @@ -3486,10 +3485,10 @@ def update_dr_plan_execution(self, update_dr_plan_execution_details, dr_plan_exe "drPlanExecutionId": dr_plan_execution_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3498,7 +3497,7 @@ def update_dr_plan_execution(self, update_dr_plan_execution_details, dr_plan_exe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3589,7 +3588,7 @@ def update_dr_protection_group(self, update_dr_protection_group_details, dr_prot "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dr_protection_group got unknown kwargs: {extra_kwargs!r}") @@ -3598,10 +3597,10 @@ def update_dr_protection_group(self, update_dr_protection_group_details, dr_prot "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3610,7 +3609,7 @@ def update_dr_protection_group(self, update_dr_protection_group_details, dr_prot "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3709,7 +3708,7 @@ def update_dr_protection_group_role(self, update_dr_protection_group_role_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dr_protection_group_role got unknown kwargs: {extra_kwargs!r}") @@ -3718,10 +3717,10 @@ def update_dr_protection_group_role(self, update_dr_protection_group_role_detail "drProtectionGroupId": dr_protection_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3731,7 +3730,7 @@ def update_dr_protection_group_role(self, update_dr_protection_group_role_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dns/dns_client.py b/src/oci/dns/dns_client.py index 56d49af9af..c53f67878e 100644 --- a/src/oci/dns/dns_client.py +++ b/src/oci/dns/dns_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -192,7 +191,7 @@ def change_resolver_compartment(self, resolver_id, change_resolver_compartment_d "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_resolver_compartment got unknown kwargs: {extra_kwargs!r}") @@ -201,10 +200,10 @@ def change_resolver_compartment(self, resolver_id, change_resolver_compartment_d "resolverId": resolver_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -217,7 +216,7 @@ def change_resolver_compartment(self, resolver_id, change_resolver_compartment_d query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -226,7 +225,7 @@ def change_resolver_compartment(self, resolver_id, change_resolver_compartment_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -335,7 +334,7 @@ def change_steering_policy_compartment(self, steering_policy_id, change_steering "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_steering_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -344,10 +343,10 @@ def change_steering_policy_compartment(self, steering_policy_id, change_steering "steeringPolicyId": steering_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -360,7 +359,7 @@ def change_steering_policy_compartment(self, steering_policy_id, change_steering query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -369,7 +368,7 @@ def change_steering_policy_compartment(self, steering_policy_id, change_steering "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -478,7 +477,7 @@ def change_tsig_key_compartment(self, tsig_key_id, change_tsig_key_compartment_d "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_tsig_key_compartment got unknown kwargs: {extra_kwargs!r}") @@ -487,10 +486,10 @@ def change_tsig_key_compartment(self, tsig_key_id, change_tsig_key_compartment_d "tsigKeyId": tsig_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -503,7 +502,7 @@ def change_tsig_key_compartment(self, tsig_key_id, change_tsig_key_compartment_d query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -512,7 +511,7 @@ def change_tsig_key_compartment(self, tsig_key_id, change_tsig_key_compartment_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -623,7 +622,7 @@ def change_view_compartment(self, view_id, change_view_compartment_details, **kw "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_view_compartment got unknown kwargs: {extra_kwargs!r}") @@ -632,10 +631,10 @@ def change_view_compartment(self, view_id, change_view_compartment_details, **kw "viewId": view_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -648,7 +647,7 @@ def change_view_compartment(self, view_id, change_view_compartment_details, **kw query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -657,7 +656,7 @@ def change_view_compartment(self, view_id, change_view_compartment_details, **kw "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -773,7 +772,7 @@ def change_zone_compartment(self, zone_id, change_zone_compartment_details, **kw "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_zone_compartment got unknown kwargs: {extra_kwargs!r}") @@ -782,10 +781,10 @@ def change_zone_compartment(self, zone_id, change_zone_compartment_details, **kw "zoneId": zone_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -798,7 +797,7 @@ def change_zone_compartment(self, zone_id, change_zone_compartment_details, **kw query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -807,7 +806,7 @@ def change_zone_compartment(self, zone_id, change_zone_compartment_details, **kw "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -908,7 +907,7 @@ def create_resolver_endpoint(self, resolver_id, create_resolver_endpoint_details "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_resolver_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -917,10 +916,10 @@ def create_resolver_endpoint(self, resolver_id, create_resolver_endpoint_details "resolverId": resolver_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -933,7 +932,7 @@ def create_resolver_endpoint(self, resolver_id, create_resolver_endpoint_details query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -941,7 +940,7 @@ def create_resolver_endpoint(self, resolver_id, create_resolver_endpoint_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1044,7 +1043,7 @@ def create_steering_policy(self, create_steering_policy_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_steering_policy got unknown kwargs: {extra_kwargs!r}") @@ -1059,7 +1058,7 @@ def create_steering_policy(self, create_steering_policy_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1067,7 +1066,7 @@ def create_steering_policy(self, create_steering_policy_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1170,7 +1169,7 @@ def create_steering_policy_attachment(self, create_steering_policy_attachment_de "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_steering_policy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1185,7 +1184,7 @@ def create_steering_policy_attachment(self, create_steering_policy_attachment_de query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1193,7 +1192,7 @@ def create_steering_policy_attachment(self, create_steering_policy_attachment_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1283,7 +1282,7 @@ def create_tsig_key(self, create_tsig_key_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tsig_key got unknown kwargs: {extra_kwargs!r}") @@ -1298,14 +1297,14 @@ def create_tsig_key(self, create_tsig_key_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1402,7 +1401,7 @@ def create_view(self, create_view_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_view got unknown kwargs: {extra_kwargs!r}") @@ -1417,7 +1416,7 @@ def create_view(self, create_view_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1425,7 +1424,7 @@ def create_view(self, create_view_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1527,7 +1526,7 @@ def create_zone(self, create_zone_details, **kwargs): "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_zone got unknown kwargs: {extra_kwargs!r}") @@ -1544,14 +1543,14 @@ def create_zone(self, create_zone_details, **kwargs): "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1652,7 +1651,7 @@ def create_zone_from_zone_file(self, compartment_id, create_zone_from_zone_file_ "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_zone_from_zone_file got unknown kwargs: {extra_kwargs!r}") @@ -1669,13 +1668,13 @@ def create_zone_from_zone_file(self, compartment_id, create_zone_from_zone_file_ "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1684,7 +1683,7 @@ def create_zone_from_zone_file(self, compartment_id, create_zone_from_zone_file_ create_zone_from_zone_file_details = kwargs.get("create_zone_from_zone_file_details", missing) if create_zone_from_zone_file_details is not missing and create_zone_from_zone_file_details is not None: - if (not isinstance(create_zone_from_zone_file_details, (six.binary_type, six.string_types)) and + if (not isinstance(create_zone_from_zone_file_details, (bytes, str)) and not hasattr(create_zone_from_zone_file_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1814,7 +1813,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_domain_records got unknown kwargs: {extra_kwargs!r}") @@ -1824,10 +1823,10 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "domain": domain } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -1842,7 +1841,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1851,7 +1850,7 @@ def delete_domain_records(self, zone_name_or_id, domain, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1960,7 +1959,7 @@ def delete_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_resolver_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1970,10 +1969,10 @@ def delete_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs "resolverEndpointName": resolver_endpoint_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -1986,7 +1985,7 @@ def delete_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1995,7 +1994,7 @@ def delete_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2114,7 +2113,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rr_set got unknown kwargs: {extra_kwargs!r}") @@ -2125,10 +2124,10 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "rtype": rtype } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2143,7 +2142,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2152,7 +2151,7 @@ def delete_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2258,7 +2257,7 @@ def delete_steering_policy(self, steering_policy_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_steering_policy got unknown kwargs: {extra_kwargs!r}") @@ -2267,10 +2266,10 @@ def delete_steering_policy(self, steering_policy_id, **kwargs): "steeringPolicyId": steering_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2283,7 +2282,7 @@ def delete_steering_policy(self, steering_policy_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2292,7 +2291,7 @@ def delete_steering_policy(self, steering_policy_id, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2393,7 +2392,7 @@ def delete_steering_policy_attachment(self, steering_policy_attachment_id, **kwa "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_steering_policy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2402,10 +2401,10 @@ def delete_steering_policy_attachment(self, steering_policy_attachment_id, **kwa "steeringPolicyAttachmentId": steering_policy_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2418,7 +2417,7 @@ def delete_steering_policy_attachment(self, steering_policy_attachment_id, **kwa query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2427,7 +2426,7 @@ def delete_steering_policy_attachment(self, steering_policy_attachment_id, **kwa "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2527,7 +2526,7 @@ def delete_tsig_key(self, tsig_key_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tsig_key got unknown kwargs: {extra_kwargs!r}") @@ -2536,10 +2535,10 @@ def delete_tsig_key(self, tsig_key_id, **kwargs): "tsigKeyId": tsig_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2552,7 +2551,7 @@ def delete_tsig_key(self, tsig_key_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2561,7 +2560,7 @@ def delete_tsig_key(self, tsig_key_id, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2666,7 +2665,7 @@ def delete_view(self, view_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_view got unknown kwargs: {extra_kwargs!r}") @@ -2675,10 +2674,10 @@ def delete_view(self, view_id, **kwargs): "viewId": view_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2691,7 +2690,7 @@ def delete_view(self, view_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2700,7 +2699,7 @@ def delete_view(self, view_id, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2814,7 +2813,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_zone got unknown kwargs: {extra_kwargs!r}") @@ -2823,10 +2822,10 @@ def delete_zone(self, zone_name_or_id, **kwargs): "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -2841,7 +2840,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2850,7 +2849,7 @@ def delete_zone(self, zone_name_or_id, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2996,7 +2995,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "sort_order", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_domain_records got unknown kwargs: {extra_kwargs!r}") @@ -3006,10 +3005,10 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "domain": domain } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3044,7 +3043,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3053,7 +3052,7 @@ def get_domain_records(self, zone_name_or_id, domain, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3158,7 +3157,7 @@ def get_resolver(self, resolver_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resolver got unknown kwargs: {extra_kwargs!r}") @@ -3167,10 +3166,10 @@ def get_resolver(self, resolver_id, **kwargs): "resolverId": resolver_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3183,7 +3182,7 @@ def get_resolver(self, resolver_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3192,7 +3191,7 @@ def get_resolver(self, resolver_id, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3300,7 +3299,7 @@ def get_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resolver_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3310,10 +3309,10 @@ def get_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs): "resolverEndpointName": resolver_endpoint_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3326,7 +3325,7 @@ def get_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3335,7 +3334,7 @@ def get_resolver_endpoint(self, resolver_id, resolver_endpoint_name, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3468,7 +3467,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rr_set got unknown kwargs: {extra_kwargs!r}") @@ -3479,10 +3478,10 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "rtype": rtype } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3500,7 +3499,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3509,7 +3508,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3611,7 +3610,7 @@ def get_steering_policy(self, steering_policy_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_steering_policy got unknown kwargs: {extra_kwargs!r}") @@ -3620,10 +3619,10 @@ def get_steering_policy(self, steering_policy_id, **kwargs): "steeringPolicyId": steering_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3636,7 +3635,7 @@ def get_steering_policy(self, steering_policy_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3645,7 +3644,7 @@ def get_steering_policy(self, steering_policy_id, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3747,7 +3746,7 @@ def get_steering_policy_attachment(self, steering_policy_attachment_id, **kwargs "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_steering_policy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -3756,10 +3755,10 @@ def get_steering_policy_attachment(self, steering_policy_attachment_id, **kwargs "steeringPolicyAttachmentId": steering_policy_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3772,7 +3771,7 @@ def get_steering_policy_attachment(self, steering_policy_attachment_id, **kwargs query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3781,7 +3780,7 @@ def get_steering_policy_attachment(self, steering_policy_attachment_id, **kwargs "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3883,7 +3882,7 @@ def get_tsig_key(self, tsig_key_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tsig_key got unknown kwargs: {extra_kwargs!r}") @@ -3892,10 +3891,10 @@ def get_tsig_key(self, tsig_key_id, **kwargs): "tsigKeyId": tsig_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -3908,7 +3907,7 @@ def get_tsig_key(self, tsig_key_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3917,7 +3916,7 @@ def get_tsig_key(self, tsig_key_id, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4023,7 +4022,7 @@ def get_view(self, view_id, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_view got unknown kwargs: {extra_kwargs!r}") @@ -4032,10 +4031,10 @@ def get_view(self, view_id, **kwargs): "viewId": view_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -4048,7 +4047,7 @@ def get_view(self, view_id, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4057,7 +4056,7 @@ def get_view(self, view_id, **kwargs): "If-None-Match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4172,7 +4171,7 @@ def get_zone(self, zone_name_or_id, **kwargs): "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_zone got unknown kwargs: {extra_kwargs!r}") @@ -4181,10 +4180,10 @@ def get_zone(self, zone_name_or_id, **kwargs): "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -4199,7 +4198,7 @@ def get_zone(self, zone_name_or_id, **kwargs): "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4208,7 +4207,7 @@ def get_zone(self, zone_name_or_id, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4314,7 +4313,7 @@ def get_zone_content(self, zone_name_or_id, **kwargs): "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_zone_content got unknown kwargs: {extra_kwargs!r}") @@ -4323,10 +4322,10 @@ def get_zone_content(self, zone_name_or_id, **kwargs): "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -4340,7 +4339,7 @@ def get_zone_content(self, zone_name_or_id, **kwargs): "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "text/dns", @@ -4349,7 +4348,7 @@ def get_zone_content(self, zone_name_or_id, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4509,7 +4508,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "scope", "view_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_zone_records got unknown kwargs: {extra_kwargs!r}") @@ -4518,10 +4517,10 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4558,7 +4557,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "scope": kwargs.get("scope", missing), "viewId": kwargs.get("view_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4567,7 +4566,7 @@ def get_zone_records(self, zone_name_or_id, **kwargs): "If-Modified-Since": kwargs.get("if_modified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4688,7 +4687,7 @@ def list_resolver_endpoints(self, resolver_id, **kwargs): "lifecycle_state", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resolver_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -4697,10 +4696,10 @@ def list_resolver_endpoints(self, resolver_id, **kwargs): "resolverId": resolver_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4740,14 +4739,14 @@ def list_resolver_endpoints(self, resolver_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4874,7 +4873,7 @@ def list_resolvers(self, compartment_id, **kwargs): "lifecycle_state", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resolvers got unknown kwargs: {extra_kwargs!r}") @@ -4918,14 +4917,14 @@ def list_resolvers(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5074,7 +5073,7 @@ def list_steering_policies(self, compartment_id, **kwargs): "sort_order", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_steering_policies got unknown kwargs: {extra_kwargs!r}") @@ -5123,14 +5122,14 @@ def list_steering_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5284,7 +5283,7 @@ def list_steering_policy_attachments(self, compartment_id, **kwargs): "sort_order", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_steering_policy_attachments got unknown kwargs: {extra_kwargs!r}") @@ -5334,14 +5333,14 @@ def list_steering_policy_attachments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5461,7 +5460,7 @@ def list_tsig_keys(self, compartment_id, **kwargs): "sort_order", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tsig_keys got unknown kwargs: {extra_kwargs!r}") @@ -5505,14 +5504,14 @@ def list_tsig_keys(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5637,7 +5636,7 @@ def list_views(self, compartment_id, **kwargs): "lifecycle_state", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_views got unknown kwargs: {extra_kwargs!r}") @@ -5681,14 +5680,14 @@ def list_views(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5780,7 +5779,7 @@ def list_zone_transfer_servers(self, compartment_id, **kwargs): "scope", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_zone_transfer_servers got unknown kwargs: {extra_kwargs!r}") @@ -5797,14 +5796,14 @@ def list_zone_transfer_servers(self, compartment_id, **kwargs): "scope": kwargs.get("scope", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5958,7 +5957,7 @@ def list_zones(self, compartment_id, **kwargs): "view_id", "tsig_key_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_zones got unknown kwargs: {extra_kwargs!r}") @@ -6014,14 +6013,14 @@ def list_zones(self, compartment_id, **kwargs): "viewId": kwargs.get("view_id", missing), "tsigKeyId": kwargs.get("tsig_key_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6144,7 +6143,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_domain_records got unknown kwargs: {extra_kwargs!r}") @@ -6154,10 +6153,10 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "domain": domain } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6172,7 +6171,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6181,7 +6180,7 @@ def patch_domain_records(self, zone_name_or_id, domain, patch_domain_records_det "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6309,7 +6308,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_rr_set got unknown kwargs: {extra_kwargs!r}") @@ -6320,10 +6319,10 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "rtype": rtype } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6338,7 +6337,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6347,7 +6346,7 @@ def patch_rr_set(self, zone_name_or_id, domain, rtype, patch_rr_set_details, **k "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6471,7 +6470,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_zone_records got unknown kwargs: {extra_kwargs!r}") @@ -6480,10 +6479,10 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6498,7 +6497,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6507,7 +6506,7 @@ def patch_zone_records(self, zone_name_or_id, patch_zone_records_details, **kwar "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6634,7 +6633,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_domain_records got unknown kwargs: {extra_kwargs!r}") @@ -6644,10 +6643,10 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "domain": domain } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6662,7 +6661,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6671,7 +6670,7 @@ def update_domain_records(self, zone_name_or_id, domain, update_domain_records_d "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6780,7 +6779,7 @@ def update_resolver(self, resolver_id, update_resolver_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_resolver got unknown kwargs: {extra_kwargs!r}") @@ -6789,10 +6788,10 @@ def update_resolver(self, resolver_id, update_resolver_details, **kwargs): "resolverId": resolver_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6805,7 +6804,7 @@ def update_resolver(self, resolver_id, update_resolver_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6814,7 +6813,7 @@ def update_resolver(self, resolver_id, update_resolver_details, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6926,7 +6925,7 @@ def update_resolver_endpoint(self, resolver_id, resolver_endpoint_name, update_r "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_resolver_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6936,10 +6935,10 @@ def update_resolver_endpoint(self, resolver_id, resolver_endpoint_name, update_r "resolverEndpointName": resolver_endpoint_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -6952,7 +6951,7 @@ def update_resolver_endpoint(self, resolver_id, resolver_endpoint_name, update_r query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6961,7 +6960,7 @@ def update_resolver_endpoint(self, resolver_id, resolver_endpoint_name, update_r "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7089,7 +7088,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rr_set got unknown kwargs: {extra_kwargs!r}") @@ -7100,10 +7099,10 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "rtype": rtype } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7118,7 +7117,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7127,7 +7126,7 @@ def update_rr_set(self, zone_name_or_id, domain, rtype, update_rr_set_details, * "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7236,7 +7235,7 @@ def update_steering_policy(self, steering_policy_id, update_steering_policy_deta "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_steering_policy got unknown kwargs: {extra_kwargs!r}") @@ -7245,10 +7244,10 @@ def update_steering_policy(self, steering_policy_id, update_steering_policy_deta "steeringPolicyId": steering_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7261,7 +7260,7 @@ def update_steering_policy(self, steering_policy_id, update_steering_policy_deta query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7270,7 +7269,7 @@ def update_steering_policy(self, steering_policy_id, update_steering_policy_deta "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7379,7 +7378,7 @@ def update_steering_policy_attachment(self, steering_policy_attachment_id, updat "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_steering_policy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -7388,10 +7387,10 @@ def update_steering_policy_attachment(self, steering_policy_attachment_id, updat "steeringPolicyAttachmentId": steering_policy_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7404,7 +7403,7 @@ def update_steering_policy_attachment(self, steering_policy_attachment_id, updat query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7413,7 +7412,7 @@ def update_steering_policy_attachment(self, steering_policy_attachment_id, updat "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7522,7 +7521,7 @@ def update_tsig_key(self, tsig_key_id, update_tsig_key_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tsig_key got unknown kwargs: {extra_kwargs!r}") @@ -7531,10 +7530,10 @@ def update_tsig_key(self, tsig_key_id, update_tsig_key_details, **kwargs): "tsigKeyId": tsig_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7547,7 +7546,7 @@ def update_tsig_key(self, tsig_key_id, update_tsig_key_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7556,7 +7555,7 @@ def update_tsig_key(self, tsig_key_id, update_tsig_key_details, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7665,7 +7664,7 @@ def update_view(self, view_id, update_view_details, **kwargs): "opc_request_id", "scope" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_view got unknown kwargs: {extra_kwargs!r}") @@ -7674,10 +7673,10 @@ def update_view(self, view_id, update_view_details, **kwargs): "viewId": view_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7690,7 +7689,7 @@ def update_view(self, view_id, update_view_details, **kwargs): query_params = { "scope": kwargs.get("scope", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7699,7 +7698,7 @@ def update_view(self, view_id, update_view_details, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7825,7 +7824,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_zone got unknown kwargs: {extra_kwargs!r}") @@ -7834,10 +7833,10 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -7852,7 +7851,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7861,7 +7860,7 @@ def update_zone(self, zone_name_or_id, update_zone_details, **kwargs): "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7986,7 +7985,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "view_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_zone_records got unknown kwargs: {extra_kwargs!r}") @@ -7995,10 +7994,10 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "zoneNameOrId": zone_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -8013,7 +8012,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "viewId": kwargs.get("view_id", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8022,7 +8021,7 @@ def update_zone_records(self, zone_name_or_id, update_zone_records_details, **kw "If-Unmodified-Since": kwargs.get("if_unmodified_since", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/appliance_export_job_client.py b/src/oci/dts/appliance_export_job_client.py index 59232673ba..6c21eae431 100644 --- a/src/oci/dts/appliance_export_job_client.py +++ b/src/oci/dts/appliance_export_job_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def change_appliance_export_job_compartment(self, appliance_export_job_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_appliance_export_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def change_appliance_export_job_compartment(self, appliance_export_job_id, chang "applianceExportJobId": appliance_export_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def change_appliance_export_job_compartment(self, appliance_export_job_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -283,7 +282,7 @@ def create_appliance_export_job(self, create_appliance_export_job_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_appliance_export_job got unknown kwargs: {extra_kwargs!r}") @@ -294,7 +293,7 @@ def create_appliance_export_job(self, create_appliance_export_job_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -385,7 +384,7 @@ def delete_appliance_export_job(self, appliance_export_job_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_appliance_export_job got unknown kwargs: {extra_kwargs!r}") @@ -394,10 +393,10 @@ def delete_appliance_export_job(self, appliance_export_job_id, **kwargs): "applianceExportJobId": appliance_export_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -407,7 +406,7 @@ def delete_appliance_export_job(self, appliance_export_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -483,7 +482,7 @@ def get_appliance_export_job(self, appliance_export_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_appliance_export_job got unknown kwargs: {extra_kwargs!r}") @@ -492,10 +491,10 @@ def get_appliance_export_job(self, appliance_export_job_id, **kwargs): "applianceExportJobId": appliance_export_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -503,7 +502,7 @@ def get_appliance_export_job(self, appliance_export_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -608,7 +607,7 @@ def list_appliance_export_jobs(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_appliance_export_jobs got unknown kwargs: {extra_kwargs!r}") @@ -627,14 +626,14 @@ def list_appliance_export_jobs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -719,7 +718,7 @@ def update_appliance_export_job(self, appliance_export_job_id, update_appliance_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_appliance_export_job got unknown kwargs: {extra_kwargs!r}") @@ -728,10 +727,10 @@ def update_appliance_export_job(self, appliance_export_job_id, update_appliance_ "applianceExportJobId": appliance_export_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -740,7 +739,7 @@ def update_appliance_export_job(self, appliance_export_job_id, update_appliance_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/shipping_vendors_client.py b/src/oci/dts/shipping_vendors_client.py index 89ca34ba15..f3c9ce8a9e 100644 --- a/src/oci/dts/shipping_vendors_client.py +++ b/src/oci/dts/shipping_vendors_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -147,7 +146,7 @@ def list_shipping_vendors(self, **kwargs): api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shipping_vendors got unknown kwargs: {extra_kwargs!r}") diff --git a/src/oci/dts/transfer_appliance_client.py b/src/oci/dts/transfer_appliance_client.py index e21aeeb4f5..d5de696496 100644 --- a/src/oci/dts/transfer_appliance_client.py +++ b/src/oci/dts/transfer_appliance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_transfer_appliance(self, id, **kwargs): "opc_retry_token", "create_transfer_appliance_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_appliance got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def create_transfer_appliance(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -186,7 +185,7 @@ def create_transfer_appliance(self, id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -274,7 +273,7 @@ def create_transfer_appliance_admin_credentials(self, id, transfer_appliance_lab "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_appliance_admin_credentials got unknown kwargs: {extra_kwargs!r}") @@ -284,10 +283,10 @@ def create_transfer_appliance_admin_credentials(self, id, transfer_appliance_lab "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -295,7 +294,7 @@ def create_transfer_appliance_admin_credentials(self, id, transfer_appliance_lab "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -381,7 +380,7 @@ def delete_transfer_appliance(self, id, transfer_appliance_label, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_transfer_appliance got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def delete_transfer_appliance(self, id, transfer_appliance_label, **kwargs): "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -402,7 +401,7 @@ def delete_transfer_appliance(self, id, transfer_appliance_label, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -472,7 +471,7 @@ def get_transfer_appliance(self, id, transfer_appliance_label, **kwargs): api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_appliance got unknown kwargs: {extra_kwargs!r}") @@ -482,10 +481,10 @@ def get_transfer_appliance(self, id, transfer_appliance_label, **kwargs): "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -562,7 +561,7 @@ def get_transfer_appliance_certificate_authority_certificate(self, id, transfer_ api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_appliance_certificate_authority_certificate got unknown kwargs: {extra_kwargs!r}") @@ -572,10 +571,10 @@ def get_transfer_appliance_certificate_authority_certificate(self, id, transfer_ "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -652,7 +651,7 @@ def get_transfer_appliance_encryption_passphrase(self, id, transfer_appliance_la api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_appliance_encryption_passphrase got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def get_transfer_appliance_encryption_passphrase(self, id, transfer_appliance_la "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -749,7 +748,7 @@ def list_transfer_appliances(self, id, **kwargs): "retry_strategy", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transfer_appliances got unknown kwargs: {extra_kwargs!r}") @@ -758,10 +757,10 @@ def list_transfer_appliances(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -774,7 +773,7 @@ def list_transfer_appliances(self, id, **kwargs): query_params = { "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -864,7 +863,7 @@ def update_transfer_appliance(self, id, transfer_appliance_label, update_transfe "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_transfer_appliance got unknown kwargs: {extra_kwargs!r}") @@ -874,10 +873,10 @@ def update_transfer_appliance(self, id, transfer_appliance_label, update_transfe "transferApplianceLabel": transfer_appliance_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -885,7 +884,7 @@ def update_transfer_appliance(self, id, transfer_appliance_label, update_transfe "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/transfer_appliance_entitlement_client.py b/src/oci/dts/transfer_appliance_entitlement_client.py index affe4a5a2a..81c8969c81 100644 --- a/src/oci/dts/transfer_appliance_entitlement_client.py +++ b/src/oci/dts/transfer_appliance_entitlement_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def create_transfer_appliance_entitlement(self, create_transfer_appliance_entitl "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_appliance_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -178,7 +177,7 @@ def create_transfer_appliance_entitlement(self, create_transfer_appliance_entitl "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -264,7 +263,7 @@ def get_transfer_appliance_entitlement(self, id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_appliance_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -273,10 +272,10 @@ def get_transfer_appliance_entitlement(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -285,7 +284,7 @@ def get_transfer_appliance_entitlement(self, id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -371,7 +370,7 @@ def list_transfer_appliance_entitlement(self, compartment_id, **kwargs): "display_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transfer_appliance_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -381,14 +380,14 @@ def list_transfer_appliance_entitlement(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/transfer_device_client.py b/src/oci/dts/transfer_device_client.py index 797e610ad8..c48520b6a8 100644 --- a/src/oci/dts/transfer_device_client.py +++ b/src/oci/dts/transfer_device_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -165,7 +164,7 @@ def create_transfer_device(self, id, create_transfer_device_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_device got unknown kwargs: {extra_kwargs!r}") @@ -174,10 +173,10 @@ def create_transfer_device(self, id, create_transfer_device_details, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -185,7 +184,7 @@ def create_transfer_device(self, id, create_transfer_device_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def delete_transfer_device(self, id, transfer_device_label, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_transfer_device got unknown kwargs: {extra_kwargs!r}") @@ -281,10 +280,10 @@ def delete_transfer_device(self, id, transfer_device_label, **kwargs): "transferDeviceLabel": transfer_device_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def delete_transfer_device(self, id, transfer_device_label, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -362,7 +361,7 @@ def get_transfer_device(self, id, transfer_device_label, **kwargs): api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_device got unknown kwargs: {extra_kwargs!r}") @@ -372,10 +371,10 @@ def get_transfer_device(self, id, transfer_device_label, **kwargs): "transferDeviceLabel": transfer_device_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -463,7 +462,7 @@ def list_transfer_devices(self, id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transfer_devices got unknown kwargs: {extra_kwargs!r}") @@ -472,10 +471,10 @@ def list_transfer_devices(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -489,7 +488,7 @@ def list_transfer_devices(self, id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -579,7 +578,7 @@ def update_transfer_device(self, id, transfer_device_label, update_transfer_devi "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_transfer_device got unknown kwargs: {extra_kwargs!r}") @@ -589,10 +588,10 @@ def update_transfer_device(self, id, transfer_device_label, update_transfer_devi "transferDeviceLabel": transfer_device_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -600,7 +599,7 @@ def update_transfer_device(self, id, transfer_device_label, update_transfer_devi "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/transfer_job_client.py b/src/oci/dts/transfer_job_client.py index 15f88e0ea0..9657ebeff6 100644 --- a/src/oci/dts/transfer_job_client.py +++ b/src/oci/dts/transfer_job_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def change_transfer_job_compartment(self, transfer_job_id, change_transfer_job_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_transfer_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def change_transfer_job_compartment(self, transfer_job_id, change_transfer_job_c "transferJobId": transfer_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def change_transfer_job_compartment(self, transfer_job_id, change_transfer_job_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -283,7 +282,7 @@ def create_transfer_job(self, create_transfer_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_job got unknown kwargs: {extra_kwargs!r}") @@ -294,7 +293,7 @@ def create_transfer_job(self, create_transfer_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -380,7 +379,7 @@ def delete_transfer_job(self, id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_transfer_job got unknown kwargs: {extra_kwargs!r}") @@ -389,10 +388,10 @@ def delete_transfer_job(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -401,7 +400,7 @@ def delete_transfer_job(self, id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -477,7 +476,7 @@ def get_transfer_job(self, id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_job got unknown kwargs: {extra_kwargs!r}") @@ -486,10 +485,10 @@ def get_transfer_job(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -497,7 +496,7 @@ def get_transfer_job(self, id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -602,7 +601,7 @@ def list_transfer_jobs(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transfer_jobs got unknown kwargs: {extra_kwargs!r}") @@ -621,14 +620,14 @@ def list_transfer_jobs(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -713,7 +712,7 @@ def update_transfer_job(self, id, update_transfer_job_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_transfer_job got unknown kwargs: {extra_kwargs!r}") @@ -722,10 +721,10 @@ def update_transfer_job(self, id, update_transfer_job_details, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -734,7 +733,7 @@ def update_transfer_job(self, id, update_transfer_job_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/dts/transfer_package_client.py b/src/oci/dts/transfer_package_client.py index 68453ea002..c0f40c8193 100644 --- a/src/oci/dts/transfer_package_client.py +++ b/src/oci/dts/transfer_package_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def attach_devices_to_transfer_package(self, id, transfer_package_label, attach_ "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_devices_to_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def attach_devices_to_transfer_package(self, id, transfer_package_label, attach_ "transferPackageLabel": transfer_package_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def attach_devices_to_transfer_package(self, id, transfer_package_label, attach_ "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -274,7 +273,7 @@ def create_transfer_package(self, id, **kwargs): "opc_retry_token", "create_transfer_package_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -283,10 +282,10 @@ def create_transfer_package(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -294,7 +293,7 @@ def create_transfer_package(self, id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -380,7 +379,7 @@ def delete_transfer_package(self, id, transfer_package_label, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def delete_transfer_package(self, id, transfer_package_label, **kwargs): "transferPackageLabel": transfer_package_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -401,7 +400,7 @@ def delete_transfer_package(self, id, transfer_package_label, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -486,7 +485,7 @@ def detach_devices_from_transfer_package(self, id, transfer_package_label, detac "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_devices_from_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -496,10 +495,10 @@ def detach_devices_from_transfer_package(self, id, transfer_package_label, detac "transferPackageLabel": transfer_package_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -507,7 +506,7 @@ def detach_devices_from_transfer_package(self, id, transfer_package_label, detac "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -579,7 +578,7 @@ def get_transfer_package(self, id, transfer_package_label, **kwargs): api_reference_link = "" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -589,10 +588,10 @@ def get_transfer_package(self, id, transfer_package_label, **kwargs): "transferPackageLabel": transfer_package_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -680,7 +679,7 @@ def list_transfer_packages(self, id, **kwargs): "lifecycle_state", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_transfer_packages got unknown kwargs: {extra_kwargs!r}") @@ -689,10 +688,10 @@ def list_transfer_packages(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -706,7 +705,7 @@ def list_transfer_packages(self, id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -796,7 +795,7 @@ def update_transfer_package(self, id, transfer_package_label, update_transfer_pa "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_transfer_package got unknown kwargs: {extra_kwargs!r}") @@ -806,10 +805,10 @@ def update_transfer_package(self, id, transfer_package_label, update_transfer_pa "transferPackageLabel": transfer_package_label } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -817,7 +816,7 @@ def update_transfer_package(self, id, transfer_package_label, update_transfer_pa "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/em_warehouse/em_data_lake_client.py b/src/oci/em_warehouse/em_data_lake_client.py index a8b83164c5..b1ea5da306 100644 --- a/src/oci/em_warehouse/em_data_lake_client.py +++ b/src/oci/em_warehouse/em_data_lake_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -152,7 +151,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "cancel_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -161,10 +160,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -173,7 +172,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_em_warehouse_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -271,10 +270,10 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -284,7 +283,7 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -365,7 +364,7 @@ def create_em_warehouse(self, create_em_warehouse_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_em_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -376,7 +375,7 @@ def create_em_warehouse(self, create_em_warehouse_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -455,7 +454,7 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_em_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -464,10 +463,10 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -476,7 +475,7 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -546,7 +545,7 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_em_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -555,10 +554,10 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -566,7 +565,7 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -638,7 +637,7 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_em_warehouse_resource_usage got unknown kwargs: {!r}".format(extra_kwargs)) @@ -647,10 +646,10 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -658,7 +657,7 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -730,7 +729,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -739,10 +738,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -750,7 +749,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -861,7 +860,7 @@ def list_em_warehouses(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_em_warehouses got unknown kwargs: {!r}".format(extra_kwargs)) @@ -898,14 +897,14 @@ def list_em_warehouses(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1005,7 +1004,7 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_etl_runs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1014,10 +1013,10 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_order' in kwargs: @@ -1042,14 +1041,14 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1143,7 +1142,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1152,10 +1151,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_by' in kwargs: @@ -1178,14 +1177,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1279,7 +1278,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1288,10 +1287,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_by' in kwargs: @@ -1314,14 +1313,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1430,7 +1429,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1466,14 +1465,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1556,7 +1555,7 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_em_warehouse got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1565,10 +1564,10 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -1577,7 +1576,7 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/em_warehouse/em_warehouse_client.py b/src/oci/em_warehouse/em_warehouse_client.py index 356ebcecfc..cf0a992f8f 100644 --- a/src/oci/em_warehouse/em_warehouse_client.py +++ b/src/oci/em_warehouse/em_warehouse_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -280,7 +279,7 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_em_warehouse_compartment got unknown kwargs: {extra_kwargs!r}") @@ -289,10 +288,10 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -302,7 +301,7 @@ def change_em_warehouse_compartment(self, em_warehouse_id, change_em_warehouse_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -387,7 +386,7 @@ def create_em_warehouse(self, create_em_warehouse_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_em_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -398,7 +397,7 @@ def create_em_warehouse(self, create_em_warehouse_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -481,7 +480,7 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_em_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -490,10 +489,10 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -502,7 +501,7 @@ def delete_em_warehouse(self, em_warehouse_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -576,7 +575,7 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_em_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -585,10 +584,10 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -596,7 +595,7 @@ def get_em_warehouse(self, em_warehouse_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -672,7 +671,7 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_em_warehouse_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -681,10 +680,10 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -692,7 +691,7 @@ def get_em_warehouse_resource_usage(self, em_warehouse_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -768,7 +767,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -777,10 +776,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -788,7 +787,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -903,7 +902,7 @@ def list_em_warehouses(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_em_warehouses got unknown kwargs: {extra_kwargs!r}") @@ -940,14 +939,14 @@ def list_em_warehouses(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1051,7 +1050,7 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_etl_runs got unknown kwargs: {extra_kwargs!r}") @@ -1060,10 +1059,10 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1088,14 +1087,14 @@ def list_etl_runs(self, em_warehouse_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1193,7 +1192,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1202,10 +1201,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1228,14 +1227,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1333,7 +1332,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1342,10 +1341,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1368,14 +1367,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1488,7 +1487,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1524,14 +1523,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1618,7 +1617,7 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_em_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -1627,10 +1626,10 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "emWarehouseId": em_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1639,7 +1638,7 @@ def update_em_warehouse(self, em_warehouse_id, update_em_warehouse_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/email/email_client.py b/src/oci/email/email_client.py index f8e386d18c..17db56adc1 100644 --- a/src/oci/email/email_client.py +++ b/src/oci/email/email_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def change_email_domain_compartment(self, email_domain_id, change_email_domain_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_email_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -197,10 +196,10 @@ def change_email_domain_compartment(self, email_domain_id, change_email_domain_c "emailDomainId": email_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -210,7 +209,7 @@ def change_email_domain_compartment(self, email_domain_id, change_email_domain_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def change_sender_compartment(self, sender_id, change_sender_compartment_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sender_compartment got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def change_sender_compartment(self, sender_id, change_sender_compartment_details "senderId": sender_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -317,7 +316,7 @@ def change_sender_compartment(self, sender_id, change_sender_compartment_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -405,7 +404,7 @@ def create_dkim(self, create_dkim_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dkim got unknown kwargs: {extra_kwargs!r}") @@ -416,7 +415,7 @@ def create_dkim(self, create_dkim_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -501,7 +500,7 @@ def create_email_domain(self, create_email_domain_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -512,7 +511,7 @@ def create_email_domain(self, create_email_domain_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def create_sender(self, create_sender_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sender got unknown kwargs: {extra_kwargs!r}") @@ -599,7 +598,7 @@ def create_sender(self, create_sender_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -678,7 +677,7 @@ def create_suppression(self, create_suppression_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_suppression got unknown kwargs: {extra_kwargs!r}") @@ -688,7 +687,7 @@ def create_suppression(self, create_suppression_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -777,7 +776,7 @@ def delete_dkim(self, dkim_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dkim got unknown kwargs: {extra_kwargs!r}") @@ -786,10 +785,10 @@ def delete_dkim(self, dkim_id, **kwargs): "dkimId": dkim_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -798,7 +797,7 @@ def delete_dkim(self, dkim_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -880,7 +879,7 @@ def delete_email_domain(self, email_domain_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -889,10 +888,10 @@ def delete_email_domain(self, email_domain_id, **kwargs): "emailDomainId": email_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -901,7 +900,7 @@ def delete_email_domain(self, email_domain_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -982,7 +981,7 @@ def delete_sender(self, sender_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sender got unknown kwargs: {extra_kwargs!r}") @@ -991,10 +990,10 @@ def delete_sender(self, sender_id, **kwargs): "senderId": sender_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1003,7 +1002,7 @@ def delete_sender(self, sender_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1078,7 +1077,7 @@ def delete_suppression(self, suppression_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_suppression got unknown kwargs: {extra_kwargs!r}") @@ -1087,10 +1086,10 @@ def delete_suppression(self, suppression_id, **kwargs): "suppressionId": suppression_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1098,7 +1097,7 @@ def delete_suppression(self, suppression_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1174,7 +1173,7 @@ def get_dkim(self, dkim_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dkim got unknown kwargs: {extra_kwargs!r}") @@ -1183,10 +1182,10 @@ def get_dkim(self, dkim_id, **kwargs): "dkimId": dkim_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1194,7 +1193,7 @@ def get_dkim(self, dkim_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1270,7 +1269,7 @@ def get_email_configuration(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_email_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1278,14 +1277,14 @@ def get_email_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1363,7 +1362,7 @@ def get_email_domain(self, email_domain_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -1372,10 +1371,10 @@ def get_email_domain(self, email_domain_id, **kwargs): "emailDomainId": email_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1383,7 +1382,7 @@ def get_email_domain(self, email_domain_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1459,7 +1458,7 @@ def get_sender(self, sender_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sender got unknown kwargs: {extra_kwargs!r}") @@ -1468,10 +1467,10 @@ def get_sender(self, sender_id, **kwargs): "senderId": sender_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1479,7 +1478,7 @@ def get_sender(self, sender_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1556,7 +1555,7 @@ def get_suppression(self, suppression_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_suppression got unknown kwargs: {extra_kwargs!r}") @@ -1565,10 +1564,10 @@ def get_suppression(self, suppression_id, **kwargs): "suppressionId": suppression_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1576,7 +1575,7 @@ def get_suppression(self, suppression_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1652,7 +1651,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1661,10 +1660,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1672,7 +1671,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1798,7 +1797,7 @@ def list_dkims(self, email_domain_id, **kwargs): "lifecycle_state", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dkims got unknown kwargs: {extra_kwargs!r}") @@ -1834,14 +1833,14 @@ def list_dkims(self, email_domain_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1965,7 +1964,7 @@ def list_email_domains(self, compartment_id, **kwargs): "lifecycle_state", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_email_domains got unknown kwargs: {extra_kwargs!r}") @@ -2001,14 +2000,14 @@ def list_email_domains(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2129,7 +2128,7 @@ def list_senders(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_senders got unknown kwargs: {extra_kwargs!r}") @@ -2165,14 +2164,14 @@ def list_senders(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2311,7 +2310,7 @@ def list_suppressions(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_suppressions got unknown kwargs: {extra_kwargs!r}") @@ -2340,14 +2339,14 @@ def list_suppressions(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2439,7 +2438,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2448,24 +2447,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2559,7 +2558,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2568,24 +2567,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2683,7 +2682,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2694,14 +2693,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2788,7 +2787,7 @@ def update_dkim(self, dkim_id, update_dkim_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dkim got unknown kwargs: {extra_kwargs!r}") @@ -2797,10 +2796,10 @@ def update_dkim(self, dkim_id, update_dkim_details, **kwargs): "dkimId": dkim_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2809,7 +2808,7 @@ def update_dkim(self, dkim_id, update_dkim_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2896,7 +2895,7 @@ def update_email_domain(self, email_domain_id, update_email_domain_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -2905,10 +2904,10 @@ def update_email_domain(self, email_domain_id, update_email_domain_details, **kw "emailDomainId": email_domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2917,7 +2916,7 @@ def update_email_domain(self, email_domain_id, update_email_domain_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3007,7 +3006,7 @@ def update_sender(self, sender_id, update_sender_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sender got unknown kwargs: {extra_kwargs!r}") @@ -3016,10 +3015,10 @@ def update_sender(self, sender_id, update_sender_details, **kwargs): "senderId": sender_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3028,7 +3027,7 @@ def update_sender(self, sender_id, update_sender_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/email_data_plane/email_dp_client.py b/src/oci/email_data_plane/email_dp_client.py index 9faa8c0b1f..5a8b3108d1 100644 --- a/src/oci/email_data_plane/email_dp_client.py +++ b/src/oci/email_data_plane/email_dp_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -159,7 +158,7 @@ def submit_email(self, submit_email_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"submit_email got unknown kwargs: {extra_kwargs!r}") @@ -169,7 +168,7 @@ def submit_email(self, submit_email_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/encryption/internal/streaming.py b/src/oci/encryption/internal/streaming.py index f4dac517e2..bb497b442a 100644 --- a/src/oci/encryption/internal/streaming.py +++ b/src/oci/encryption/internal/streaming.py @@ -6,7 +6,6 @@ import base64 import math import json -from oci._vendor import six from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.ciphers import Cipher, modes from threading import Lock @@ -67,15 +66,15 @@ def _validate_encryption_context(encryption_context): invalid_keys = [] invalid_values = [] invalid_prefix_keys = [] - for key, value in six.iteritems(encryption_context): + for key, value in encryption_context.items(): # keys and values must be str and not bytes # in python 2 'bytes' is just an alias for 'str' so it is okay - if (str != bytes and isinstance(key, bytes)) or not isinstance(key, six.string_types): + if (str != bytes and isinstance(key, bytes)) or not isinstance(key, str): invalid_keys.append(key) elif key.startswith("oci-"): invalid_prefix_keys.append(key) - if (str != bytes and isinstance(value, bytes)) or not isinstance(value, six.string_types): + if (str != bytes and isinstance(value, bytes)) or not isinstance(value, str): invalid_values.append(value) if invalid_keys or invalid_values: diff --git a/src/oci/encryption/internal/utils.py b/src/oci/encryption/internal/utils.py index 5ecb36ad6e..edca6de8ed 100644 --- a/src/oci/encryption/internal/utils.py +++ b/src/oci/encryption/internal/utils.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -from oci._vendor import six import os from oci.encryption.internal.defaults import DEFAULT_ENCODING import zlib @@ -11,7 +10,7 @@ def convert_to_bytes(data): - if isinstance(data, six.string_types) and not isinstance(data, bytes): + if isinstance(data, str) and not isinstance(data, bytes): return data.encode(DEFAULT_ENCODING) return data @@ -30,7 +29,7 @@ def convert_bytes_to_base64_encoded_string(data): def convert_base64_encoded_string_to_bytes(data): - if not isinstance(data, six.string_types) or isinstance(data, bytes): + if not isinstance(data, str) or isinstance(data, bytes): raise TypeError("Cannot convert non string like object") return base64.b64decode(data) @@ -69,8 +68,4 @@ def verify_crc32_checksum(input_bytes, checksum): def raise_runtime_error_from(runtime_exc_message, orig_exc): - if six.PY2: - # python 2 does not support exception chaining so we append the inner exception to the message - raise RuntimeError("{} Caused by exception: {}".format(runtime_exc_message, str(orig_exc))) - else: - six.raise_from(RuntimeError(runtime_exc_message), orig_exc) + raise RuntimeError(runtime_exc_message) from orig_exc diff --git a/src/oci/encryption/key_providers.py b/src/oci/encryption/key_providers.py index 469f2e3b0b..5ab038b400 100644 --- a/src/oci/encryption/key_providers.py +++ b/src/oci/encryption/key_providers.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -from oci._vendor import six import abc import base64 @@ -18,8 +17,7 @@ ) -@six.add_metaclass(abc.ABCMeta) -class MasterKeyProvider(object): +class MasterKeyProvider(object, metaclass = abc.ABCMeta): """ An abstract base class defining methods to vend MasterKeys for use in encryption and decryption. @@ -116,8 +114,7 @@ def get_master_key(self, **kwargs): return kms_master_key -@six.add_metaclass(abc.ABCMeta) -class MasterKey(object): +class MasterKey(object, metaclass = abc.ABCMeta): """ An abstract base class representing a MasterKey resource to be used in encryption and decryption operations. diff --git a/src/oci/encryption/models.py b/src/oci/encryption/models.py index c8d685987f..b69b078a3a 100644 --- a/src/oci/encryption/models.py +++ b/src/oci/encryption/models.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -from oci._vendor import six import abc @@ -43,8 +42,7 @@ def get_encryption_context(self): return self._encryption_context -@six.add_metaclass(abc.ABCMeta) -class CryptoResultStream(object): +class CryptoResultStream(object, metaclass = abc.ABCMeta): """ The result of an SDK stream encryption or decryption operation. """ diff --git a/src/oci/events/events_client.py b/src/oci/events/events_client.py index e168c896f7..a9f91f1185 100644 --- a/src/oci/events/events_client.py +++ b/src/oci/events/events_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def change_rule_compartment(self, rule_id, change_rule_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_rule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def change_rule_compartment(self, rule_id, change_rule_compartment_details, **kw "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def change_rule_compartment(self, rule_id, change_rule_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def create_rule(self, create_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rule got unknown kwargs: {extra_kwargs!r}") @@ -300,7 +299,7 @@ def create_rule(self, create_rule_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -386,7 +385,7 @@ def delete_rule(self, rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rule got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def delete_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -407,7 +406,7 @@ def delete_rule(self, rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -484,7 +483,7 @@ def get_rule(self, rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rule got unknown kwargs: {extra_kwargs!r}") @@ -493,10 +492,10 @@ def get_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -504,7 +503,7 @@ def get_rule(self, rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -632,7 +631,7 @@ def list_rules(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rules got unknown kwargs: {extra_kwargs!r}") @@ -667,14 +666,14 @@ def list_rules(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def update_rule(self, rule_id, update_rule_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rule got unknown kwargs: {extra_kwargs!r}") @@ -771,10 +770,10 @@ def update_rule(self, rule_id, update_rule_details, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -783,7 +782,7 @@ def update_rule(self, rule_id, update_rule_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/file_storage/file_storage_client.py b/src/oci/file_storage/file_storage_client.py index 59c8fcc663..9bae44ce1d 100644 --- a/src/oci/file_storage/file_storage_client.py +++ b/src/oci/file_storage/file_storage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def change_file_system_compartment(self, file_system_id, change_file_system_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_file_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def change_file_system_compartment(self, file_system_id, change_file_system_comp "fileSystemId": file_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def change_file_system_compartment(self, file_system_id, change_file_system_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -288,7 +287,7 @@ def change_filesystem_snapshot_policy_compartment(self, filesystem_snapshot_poli "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_filesystem_snapshot_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -297,10 +296,10 @@ def change_filesystem_snapshot_policy_compartment(self, filesystem_snapshot_poli "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -309,7 +308,7 @@ def change_filesystem_snapshot_policy_compartment(self, filesystem_snapshot_poli "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -401,7 +400,7 @@ def change_mount_target_compartment(self, mount_target_id, change_mount_target_c "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_mount_target_compartment got unknown kwargs: {extra_kwargs!r}") @@ -410,10 +409,10 @@ def change_mount_target_compartment(self, mount_target_id, change_mount_target_c "mountTargetId": mount_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -422,7 +421,7 @@ def change_mount_target_compartment(self, mount_target_id, change_mount_target_c "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -516,7 +515,7 @@ def change_outbound_connector_compartment(self, outbound_connector_id, change_ou "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_outbound_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -525,10 +524,10 @@ def change_outbound_connector_compartment(self, outbound_connector_id, change_ou "outboundConnectorId": outbound_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -537,7 +536,7 @@ def change_outbound_connector_compartment(self, outbound_connector_id, change_ou "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -630,7 +629,7 @@ def change_replication_compartment(self, replication_id, change_replication_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_replication_compartment got unknown kwargs: {extra_kwargs!r}") @@ -639,10 +638,10 @@ def change_replication_compartment(self, replication_id, change_replication_comp "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -651,7 +650,7 @@ def change_replication_compartment(self, replication_id, change_replication_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -737,7 +736,7 @@ def create_export(self, create_export_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_export got unknown kwargs: {extra_kwargs!r}") @@ -748,7 +747,7 @@ def create_export(self, create_export_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -867,7 +866,7 @@ def create_file_system(self, create_file_system_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_file_system got unknown kwargs: {extra_kwargs!r}") @@ -878,7 +877,7 @@ def create_file_system(self, create_file_system_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -968,7 +967,7 @@ def create_filesystem_snapshot_policy(self, create_filesystem_snapshot_policy_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -979,7 +978,7 @@ def create_filesystem_snapshot_policy(self, create_filesystem_snapshot_policy_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1100,7 +1099,7 @@ def create_mount_target(self, create_mount_target_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -1111,7 +1110,7 @@ def create_mount_target(self, create_mount_target_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1220,7 +1219,7 @@ def create_outbound_connector(self, create_outbound_connector_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -1231,7 +1230,7 @@ def create_outbound_connector(self, create_outbound_connector_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1348,7 +1347,7 @@ def create_replication(self, create_replication_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_replication got unknown kwargs: {extra_kwargs!r}") @@ -1359,7 +1358,7 @@ def create_replication(self, create_replication_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1446,7 +1445,7 @@ def create_snapshot(self, create_snapshot_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -1457,7 +1456,7 @@ def create_snapshot(self, create_snapshot_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1545,7 +1544,7 @@ def delete_export(self, export_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_export got unknown kwargs: {extra_kwargs!r}") @@ -1554,10 +1553,10 @@ def delete_export(self, export_id, **kwargs): "exportId": export_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1566,7 +1565,7 @@ def delete_export(self, export_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1653,7 +1652,7 @@ def delete_file_system(self, file_system_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_file_system got unknown kwargs: {extra_kwargs!r}") @@ -1662,10 +1661,10 @@ def delete_file_system(self, file_system_id, **kwargs): "fileSystemId": file_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1674,7 +1673,7 @@ def delete_file_system(self, file_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1759,7 +1758,7 @@ def delete_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -1768,10 +1767,10 @@ def delete_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwa "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1780,7 +1779,7 @@ def delete_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1866,7 +1865,7 @@ def delete_mount_target(self, mount_target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -1875,10 +1874,10 @@ def delete_mount_target(self, mount_target_id, **kwargs): "mountTargetId": mount_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1887,7 +1886,7 @@ def delete_mount_target(self, mount_target_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1972,7 +1971,7 @@ def delete_outbound_connector(self, outbound_connector_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -1981,10 +1980,10 @@ def delete_outbound_connector(self, outbound_connector_id, **kwargs): "outboundConnectorId": outbound_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1993,7 +1992,7 @@ def delete_outbound_connector(self, outbound_connector_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2087,7 +2086,7 @@ def delete_replication(self, replication_id, **kwargs): "opc_request_id", "delete_mode" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replication got unknown kwargs: {extra_kwargs!r}") @@ -2096,10 +2095,10 @@ def delete_replication(self, replication_id, **kwargs): "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'delete_mode' in kwargs: @@ -2112,7 +2111,7 @@ def delete_replication(self, replication_id, **kwargs): query_params = { "deleteMode": kwargs.get("delete_mode", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2120,7 +2119,7 @@ def delete_replication(self, replication_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2210,7 +2209,7 @@ def delete_replication_target(self, replication_target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replication_target got unknown kwargs: {extra_kwargs!r}") @@ -2219,10 +2218,10 @@ def delete_replication_target(self, replication_target_id, **kwargs): "replicationTargetId": replication_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2231,7 +2230,7 @@ def delete_replication_target(self, replication_target_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2316,7 +2315,7 @@ def delete_snapshot(self, snapshot_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -2325,10 +2324,10 @@ def delete_snapshot(self, snapshot_id, **kwargs): "snapshotId": snapshot_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2337,7 +2336,7 @@ def delete_snapshot(self, snapshot_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2426,7 +2425,7 @@ def estimate_replication(self, file_system_id, **kwargs): "opc_request_id", "change_rate_in_m_bps" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"estimate_replication got unknown kwargs: {extra_kwargs!r}") @@ -2435,16 +2434,16 @@ def estimate_replication(self, file_system_id, **kwargs): "fileSystemId": file_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "changeRateInMBps": kwargs.get("change_rate_in_m_bps", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2452,7 +2451,7 @@ def estimate_replication(self, file_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2533,7 +2532,7 @@ def get_export(self, export_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_export got unknown kwargs: {extra_kwargs!r}") @@ -2542,10 +2541,10 @@ def get_export(self, export_id, **kwargs): "exportId": export_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2553,7 +2552,7 @@ def get_export(self, export_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2632,7 +2631,7 @@ def get_export_set(self, export_set_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_export_set got unknown kwargs: {extra_kwargs!r}") @@ -2641,10 +2640,10 @@ def get_export_set(self, export_set_id, **kwargs): "exportSetId": export_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2652,7 +2651,7 @@ def get_export_set(self, export_set_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2731,7 +2730,7 @@ def get_file_system(self, file_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_file_system got unknown kwargs: {extra_kwargs!r}") @@ -2740,10 +2739,10 @@ def get_file_system(self, file_system_id, **kwargs): "fileSystemId": file_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2751,7 +2750,7 @@ def get_file_system(self, file_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2830,7 +2829,7 @@ def get_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -2839,10 +2838,10 @@ def get_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwargs "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2850,7 +2849,7 @@ def get_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2929,7 +2928,7 @@ def get_mount_target(self, mount_target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -2938,10 +2937,10 @@ def get_mount_target(self, mount_target_id, **kwargs): "mountTargetId": mount_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2949,7 +2948,7 @@ def get_mount_target(self, mount_target_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3028,7 +3027,7 @@ def get_outbound_connector(self, outbound_connector_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -3037,10 +3036,10 @@ def get_outbound_connector(self, outbound_connector_id, **kwargs): "outboundConnectorId": outbound_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3048,7 +3047,7 @@ def get_outbound_connector(self, outbound_connector_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3127,7 +3126,7 @@ def get_replication(self, replication_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication got unknown kwargs: {extra_kwargs!r}") @@ -3136,10 +3135,10 @@ def get_replication(self, replication_id, **kwargs): "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3147,7 +3146,7 @@ def get_replication(self, replication_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3226,7 +3225,7 @@ def get_replication_target(self, replication_target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication_target got unknown kwargs: {extra_kwargs!r}") @@ -3235,10 +3234,10 @@ def get_replication_target(self, replication_target_id, **kwargs): "replicationTargetId": replication_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3246,7 +3245,7 @@ def get_replication_target(self, replication_target_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3325,7 +3324,7 @@ def get_snapshot(self, snapshot_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -3334,10 +3333,10 @@ def get_snapshot(self, snapshot_id, **kwargs): "snapshotId": snapshot_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3345,7 +3344,7 @@ def get_snapshot(self, snapshot_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3489,7 +3488,7 @@ def list_export_sets(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_export_sets got unknown kwargs: {extra_kwargs!r}") @@ -3526,14 +3525,14 @@ def list_export_sets(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3681,7 +3680,7 @@ def list_exports(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_exports got unknown kwargs: {extra_kwargs!r}") @@ -3718,14 +3717,14 @@ def list_exports(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3891,7 +3890,7 @@ def list_file_systems(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_file_systems got unknown kwargs: {extra_kwargs!r}") @@ -3931,14 +3930,14 @@ def list_file_systems(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4082,7 +4081,7 @@ def list_filesystem_snapshot_policies(self, compartment_id, availability_domain, "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_filesystem_snapshot_policies got unknown kwargs: {extra_kwargs!r}") @@ -4119,14 +4118,14 @@ def list_filesystem_snapshot_policies(self, compartment_id, availability_domain, "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4276,7 +4275,7 @@ def list_mount_targets(self, compartment_id, availability_domain, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_mount_targets got unknown kwargs: {extra_kwargs!r}") @@ -4314,14 +4313,14 @@ def list_mount_targets(self, compartment_id, availability_domain, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4465,7 +4464,7 @@ def list_outbound_connectors(self, compartment_id, availability_domain, **kwargs "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_outbound_connectors got unknown kwargs: {extra_kwargs!r}") @@ -4502,14 +4501,14 @@ def list_outbound_connectors(self, compartment_id, availability_domain, **kwargs "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4653,7 +4652,7 @@ def list_replication_targets(self, compartment_id, availability_domain, **kwargs "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replication_targets got unknown kwargs: {extra_kwargs!r}") @@ -4690,14 +4689,14 @@ def list_replication_targets(self, compartment_id, availability_domain, **kwargs "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4847,7 +4846,7 @@ def list_replications(self, compartment_id, availability_domain, **kwargs): "opc_request_id", "file_system_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replications got unknown kwargs: {extra_kwargs!r}") @@ -4885,14 +4884,14 @@ def list_replications(self, compartment_id, availability_domain, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "fileSystemId": kwargs.get("file_system_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5036,7 +5035,7 @@ def list_snapshots(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -5065,14 +5064,14 @@ def list_snapshots(self, **kwargs): "fileSystemId": kwargs.get("file_system_id", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5164,7 +5163,7 @@ def pause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwar "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"pause_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -5173,10 +5172,10 @@ def pause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwar "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5185,7 +5184,7 @@ def pause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwar "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5276,7 +5275,7 @@ def unpause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unpause_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -5285,10 +5284,10 @@ def unpause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kw "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5297,7 +5296,7 @@ def unpause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5387,7 +5386,7 @@ def update_export(self, export_id, update_export_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_export got unknown kwargs: {extra_kwargs!r}") @@ -5396,10 +5395,10 @@ def update_export(self, export_id, update_export_details, **kwargs): "exportId": export_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5408,7 +5407,7 @@ def update_export(self, export_id, update_export_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5500,7 +5499,7 @@ def update_export_set(self, export_set_id, update_export_set_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_export_set got unknown kwargs: {extra_kwargs!r}") @@ -5509,10 +5508,10 @@ def update_export_set(self, export_set_id, update_export_set_details, **kwargs): "exportSetId": export_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5521,7 +5520,7 @@ def update_export_set(self, export_set_id, update_export_set_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5614,7 +5613,7 @@ def update_file_system(self, file_system_id, update_file_system_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_file_system got unknown kwargs: {extra_kwargs!r}") @@ -5623,10 +5622,10 @@ def update_file_system(self, file_system_id, update_file_system_details, **kwarg "fileSystemId": file_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5635,7 +5634,7 @@ def update_file_system(self, file_system_id, update_file_system_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5727,7 +5726,7 @@ def update_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, updat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -5736,10 +5735,10 @@ def update_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, updat "filesystemSnapshotPolicyId": filesystem_snapshot_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5748,7 +5747,7 @@ def update_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, updat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5840,7 +5839,7 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -5849,10 +5848,10 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "mountTargetId": mount_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5861,7 +5860,7 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5953,7 +5952,7 @@ def update_outbound_connector(self, outbound_connector_id, update_outbound_conne "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -5962,10 +5961,10 @@ def update_outbound_connector(self, outbound_connector_id, update_outbound_conne "outboundConnectorId": outbound_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5974,7 +5973,7 @@ def update_outbound_connector(self, outbound_connector_id, update_outbound_conne "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6066,7 +6065,7 @@ def update_replication(self, replication_id, update_replication_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_replication got unknown kwargs: {extra_kwargs!r}") @@ -6075,10 +6074,10 @@ def update_replication(self, replication_id, update_replication_details, **kwarg "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6087,7 +6086,7 @@ def update_replication(self, replication_id, update_replication_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6179,7 +6178,7 @@ def update_snapshot(self, snapshot_id, update_snapshot_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -6188,10 +6187,10 @@ def update_snapshot(self, snapshot_id, update_snapshot_details, **kwargs): "snapshotId": snapshot_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6200,7 +6199,7 @@ def update_snapshot(self, snapshot_id, update_snapshot_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6281,7 +6280,7 @@ def validate_key_tabs(self, validate_key_tabs_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_key_tabs got unknown kwargs: {extra_kwargs!r}") @@ -6291,7 +6290,7 @@ def validate_key_tabs(self, validate_key_tabs_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fleet_software_update/fleet_software_update_client.py b/src/oci/fleet_software_update/fleet_software_update_client.py index 98ee3e00a6..a2a60efaec 100644 --- a/src/oci/fleet_software_update/fleet_software_update_client.py +++ b/src/oci/fleet_software_update/fleet_software_update_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def abort_fsu_discovery(self, fsu_discovery_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"abort_fsu_discovery got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def abort_fsu_discovery(self, fsu_discovery_id, **kwargs): "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def abort_fsu_discovery(self, fsu_discovery_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def add_fsu_collection_targets(self, fsu_collection_id, add_fsu_collection_targe "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_fsu_collection_targets got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def add_fsu_collection_targets(self, fsu_collection_id, add_fsu_collection_targe "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -318,7 +317,7 @@ def add_fsu_collection_targets(self, fsu_collection_id, add_fsu_collection_targe "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -413,7 +412,7 @@ def cancel_fsu_action(self, fsu_action_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -422,10 +421,10 @@ def cancel_fsu_action(self, fsu_action_id, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -435,7 +434,7 @@ def cancel_fsu_action(self, fsu_action_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -532,7 +531,7 @@ def change_fsu_action_compartment(self, fsu_action_id, change_fsu_action_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fsu_action_compartment got unknown kwargs: {extra_kwargs!r}") @@ -541,10 +540,10 @@ def change_fsu_action_compartment(self, fsu_action_id, change_fsu_action_compart "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -554,7 +553,7 @@ def change_fsu_action_compartment(self, fsu_action_id, change_fsu_action_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -653,7 +652,7 @@ def change_fsu_collection_compartment(self, fsu_collection_id, change_fsu_collec "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fsu_collection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def change_fsu_collection_compartment(self, fsu_collection_id, change_fsu_collec "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -675,7 +674,7 @@ def change_fsu_collection_compartment(self, fsu_collection_id, change_fsu_collec "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -774,7 +773,7 @@ def change_fsu_cycle_compartment(self, fsu_cycle_id, change_fsu_cycle_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fsu_cycle_compartment got unknown kwargs: {extra_kwargs!r}") @@ -783,10 +782,10 @@ def change_fsu_cycle_compartment(self, fsu_cycle_id, change_fsu_cycle_compartmen "fsuCycleId": fsu_cycle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -796,7 +795,7 @@ def change_fsu_cycle_compartment(self, fsu_cycle_id, change_fsu_cycle_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -895,7 +894,7 @@ def change_fsu_discovery_compartment(self, fsu_discovery_id, change_fsu_discover "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fsu_discovery_compartment got unknown kwargs: {extra_kwargs!r}") @@ -904,10 +903,10 @@ def change_fsu_discovery_compartment(self, fsu_discovery_id, change_fsu_discover "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -917,7 +916,7 @@ def change_fsu_discovery_compartment(self, fsu_discovery_id, change_fsu_discover "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1007,7 +1006,7 @@ def clone_fsu_cycle(self, fsu_cycle_id, clone_fsu_cycle_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clone_fsu_cycle got unknown kwargs: {extra_kwargs!r}") @@ -1016,10 +1015,10 @@ def clone_fsu_cycle(self, fsu_cycle_id, clone_fsu_cycle_details, **kwargs): "fsuCycleId": fsu_cycle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1028,7 +1027,7 @@ def clone_fsu_cycle(self, fsu_cycle_id, clone_fsu_cycle_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1117,7 +1116,7 @@ def create_fsu_action(self, create_fsu_action_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -1128,7 +1127,7 @@ def create_fsu_action(self, create_fsu_action_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1215,7 +1214,7 @@ def create_fsu_collection(self, create_fsu_collection_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fsu_collection got unknown kwargs: {extra_kwargs!r}") @@ -1226,7 +1225,7 @@ def create_fsu_collection(self, create_fsu_collection_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1313,7 +1312,7 @@ def create_fsu_cycle(self, create_fsu_cycle_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fsu_cycle got unknown kwargs: {extra_kwargs!r}") @@ -1324,7 +1323,7 @@ def create_fsu_cycle(self, create_fsu_cycle_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1411,7 +1410,7 @@ def create_fsu_discovery(self, create_fsu_discovery_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fsu_discovery got unknown kwargs: {extra_kwargs!r}") @@ -1422,7 +1421,7 @@ def create_fsu_discovery(self, create_fsu_discovery_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1509,7 +1508,7 @@ def delete_fsu_action(self, fsu_action_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -1518,10 +1517,10 @@ def delete_fsu_action(self, fsu_action_id, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1530,7 +1529,7 @@ def delete_fsu_action(self, fsu_action_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1614,7 +1613,7 @@ def delete_fsu_collection(self, fsu_collection_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fsu_collection got unknown kwargs: {extra_kwargs!r}") @@ -1623,10 +1622,10 @@ def delete_fsu_collection(self, fsu_collection_id, **kwargs): "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1635,7 +1634,7 @@ def delete_fsu_collection(self, fsu_collection_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1719,7 +1718,7 @@ def delete_fsu_cycle(self, fsu_cycle_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fsu_cycle got unknown kwargs: {extra_kwargs!r}") @@ -1728,10 +1727,10 @@ def delete_fsu_cycle(self, fsu_cycle_id, **kwargs): "fsuCycleId": fsu_cycle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1740,7 +1739,7 @@ def delete_fsu_cycle(self, fsu_cycle_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1824,7 +1823,7 @@ def delete_fsu_discovery(self, fsu_discovery_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fsu_discovery got unknown kwargs: {extra_kwargs!r}") @@ -1833,10 +1832,10 @@ def delete_fsu_discovery(self, fsu_discovery_id, **kwargs): "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1845,7 +1844,7 @@ def delete_fsu_discovery(self, fsu_discovery_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1929,7 +1928,7 @@ def delete_fsu_job(self, fsu_job_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fsu_job got unknown kwargs: {extra_kwargs!r}") @@ -1938,10 +1937,10 @@ def delete_fsu_job(self, fsu_job_id, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1950,7 +1949,7 @@ def delete_fsu_job(self, fsu_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2026,7 +2025,7 @@ def get_fsu_action(self, fsu_action_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -2035,10 +2034,10 @@ def get_fsu_action(self, fsu_action_id, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2046,7 +2045,7 @@ def get_fsu_action(self, fsu_action_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2125,7 +2124,7 @@ def get_fsu_action_output_content(self, fsu_action_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_action_output_content got unknown kwargs: {extra_kwargs!r}") @@ -2134,10 +2133,10 @@ def get_fsu_action_output_content(self, fsu_action_id, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2145,7 +2144,7 @@ def get_fsu_action_output_content(self, fsu_action_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2223,7 +2222,7 @@ def get_fsu_collection(self, fsu_collection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_collection got unknown kwargs: {extra_kwargs!r}") @@ -2232,10 +2231,10 @@ def get_fsu_collection(self, fsu_collection_id, **kwargs): "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2243,7 +2242,7 @@ def get_fsu_collection(self, fsu_collection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2321,7 +2320,7 @@ def get_fsu_cycle(self, fsu_cycle_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_cycle got unknown kwargs: {extra_kwargs!r}") @@ -2330,10 +2329,10 @@ def get_fsu_cycle(self, fsu_cycle_id, **kwargs): "fsuCycleId": fsu_cycle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2341,7 +2340,7 @@ def get_fsu_cycle(self, fsu_cycle_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2419,7 +2418,7 @@ def get_fsu_discovery(self, fsu_discovery_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_discovery got unknown kwargs: {extra_kwargs!r}") @@ -2428,10 +2427,10 @@ def get_fsu_discovery(self, fsu_discovery_id, **kwargs): "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2439,7 +2438,7 @@ def get_fsu_discovery(self, fsu_discovery_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2517,7 +2516,7 @@ def get_fsu_job(self, fsu_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_job got unknown kwargs: {extra_kwargs!r}") @@ -2526,10 +2525,10 @@ def get_fsu_job(self, fsu_job_id, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2537,7 +2536,7 @@ def get_fsu_job(self, fsu_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2615,7 +2614,7 @@ def get_fsu_job_output_content(self, fsu_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fsu_job_output_content got unknown kwargs: {extra_kwargs!r}") @@ -2624,10 +2623,10 @@ def get_fsu_job_output_content(self, fsu_job_id, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2635,7 +2634,7 @@ def get_fsu_job_output_content(self, fsu_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2713,7 +2712,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2722,10 +2721,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2733,7 +2732,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2852,7 +2851,7 @@ def list_fsu_actions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_actions got unknown kwargs: {extra_kwargs!r}") @@ -2896,14 +2895,14 @@ def list_fsu_actions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3016,7 +3015,7 @@ def list_fsu_collection_targets(self, fsu_collection_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_collection_targets got unknown kwargs: {extra_kwargs!r}") @@ -3025,10 +3024,10 @@ def list_fsu_collection_targets(self, fsu_collection_id, **kwargs): "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'status' in kwargs: @@ -3061,14 +3060,14 @@ def list_fsu_collection_targets(self, fsu_collection_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3185,7 +3184,7 @@ def list_fsu_collections(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_collections got unknown kwargs: {extra_kwargs!r}") @@ -3228,14 +3227,14 @@ def list_fsu_collections(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3358,7 +3357,7 @@ def list_fsu_cycles(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_cycles got unknown kwargs: {extra_kwargs!r}") @@ -3403,14 +3402,14 @@ def list_fsu_cycles(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3519,7 +3518,7 @@ def list_fsu_discoveries(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_discoveries got unknown kwargs: {extra_kwargs!r}") @@ -3554,14 +3553,14 @@ def list_fsu_discoveries(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3674,7 +3673,7 @@ def list_fsu_discovery_targets(self, fsu_discovery_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_discovery_targets got unknown kwargs: {extra_kwargs!r}") @@ -3683,10 +3682,10 @@ def list_fsu_discovery_targets(self, fsu_discovery_id, **kwargs): "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'status' in kwargs: @@ -3719,14 +3718,14 @@ def list_fsu_discovery_targets(self, fsu_discovery_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3815,7 +3814,7 @@ def list_fsu_job_outputs(self, fsu_job_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_job_outputs got unknown kwargs: {extra_kwargs!r}") @@ -3824,24 +3823,24 @@ def list_fsu_job_outputs(self, fsu_job_id, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3952,7 +3951,7 @@ def list_fsu_jobs(self, fsu_action_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fsu_jobs got unknown kwargs: {extra_kwargs!r}") @@ -3987,14 +3986,14 @@ def list_fsu_jobs(self, fsu_action_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4093,7 +4092,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4102,10 +4101,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4128,14 +4127,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4236,7 +4235,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4245,10 +4244,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4271,14 +4270,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4393,7 +4392,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4429,14 +4428,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4535,7 +4534,7 @@ def remove_fsu_collection_targets(self, fsu_collection_id, remove_fsu_collection "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_fsu_collection_targets got unknown kwargs: {extra_kwargs!r}") @@ -4544,10 +4543,10 @@ def remove_fsu_collection_targets(self, fsu_collection_id, remove_fsu_collection "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4557,7 +4556,7 @@ def remove_fsu_collection_targets(self, fsu_collection_id, remove_fsu_collection "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4652,7 +4651,7 @@ def resume_fsu_action(self, fsu_action_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -4661,10 +4660,10 @@ def resume_fsu_action(self, fsu_action_id, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4674,7 +4673,7 @@ def resume_fsu_action(self, fsu_action_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4768,7 +4767,7 @@ def retry_fsu_job(self, fsu_job_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retry_fsu_job got unknown kwargs: {extra_kwargs!r}") @@ -4777,10 +4776,10 @@ def retry_fsu_job(self, fsu_job_id, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4790,7 +4789,7 @@ def retry_fsu_job(self, fsu_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4878,7 +4877,7 @@ def update_fsu_action(self, fsu_action_id, update_fsu_action_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fsu_action got unknown kwargs: {extra_kwargs!r}") @@ -4887,10 +4886,10 @@ def update_fsu_action(self, fsu_action_id, update_fsu_action_details, **kwargs): "fsuActionId": fsu_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4899,7 +4898,7 @@ def update_fsu_action(self, fsu_action_id, update_fsu_action_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4988,7 +4987,7 @@ def update_fsu_collection(self, fsu_collection_id, update_fsu_collection_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fsu_collection got unknown kwargs: {extra_kwargs!r}") @@ -4997,10 +4996,10 @@ def update_fsu_collection(self, fsu_collection_id, update_fsu_collection_details "fsuCollectionId": fsu_collection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5009,7 +5008,7 @@ def update_fsu_collection(self, fsu_collection_id, update_fsu_collection_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5098,7 +5097,7 @@ def update_fsu_cycle(self, fsu_cycle_id, update_fsu_cycle_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fsu_cycle got unknown kwargs: {extra_kwargs!r}") @@ -5107,10 +5106,10 @@ def update_fsu_cycle(self, fsu_cycle_id, update_fsu_cycle_details, **kwargs): "fsuCycleId": fsu_cycle_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5119,7 +5118,7 @@ def update_fsu_cycle(self, fsu_cycle_id, update_fsu_cycle_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5208,7 +5207,7 @@ def update_fsu_discovery(self, fsu_discovery_id, update_fsu_discovery_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fsu_discovery got unknown kwargs: {extra_kwargs!r}") @@ -5217,10 +5216,10 @@ def update_fsu_discovery(self, fsu_discovery_id, update_fsu_discovery_details, * "fsuDiscoveryId": fsu_discovery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5229,7 +5228,7 @@ def update_fsu_discovery(self, fsu_discovery_id, update_fsu_discovery_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5318,7 +5317,7 @@ def update_fsu_job(self, fsu_job_id, update_fsu_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fsu_job got unknown kwargs: {extra_kwargs!r}") @@ -5327,10 +5326,10 @@ def update_fsu_job(self, fsu_job_id, update_fsu_job_details, **kwargs): "fsuJobId": fsu_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5339,7 +5338,7 @@ def update_fsu_job(self, fsu_job_id, update_fsu_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/functions/functions_invoke_client.py b/src/oci/functions/functions_invoke_client.py index f60070453e..603e3eeeae 100644 --- a/src/oci/functions/functions_invoke_client.py +++ b/src/oci/functions/functions_invoke_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def invoke_function(self, function_id, **kwargs): "fn_invoke_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"invoke_function got unknown kwargs: {extra_kwargs!r}") @@ -197,10 +196,10 @@ def invoke_function(self, function_id, **kwargs): "functionId": function_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -209,7 +208,7 @@ def invoke_function(self, function_id, **kwargs): "fn-invoke-type": kwargs.get("fn_invoke_type", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -218,7 +217,7 @@ def invoke_function(self, function_id, **kwargs): invoke_function_body = kwargs.get("invoke_function_body", missing) if invoke_function_body is not missing and invoke_function_body is not None: - if (not isinstance(invoke_function_body, (six.binary_type, six.string_types)) and + if (not isinstance(invoke_function_body, (bytes, str)) and not hasattr(invoke_function_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/functions/functions_management_client.py b/src/oci/functions/functions_management_client.py index a28ea53e25..48de4f515a 100644 --- a/src/oci/functions/functions_management_client.py +++ b/src/oci/functions/functions_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def change_application_compartment(self, application_id, change_application_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_application_compartment got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def change_application_compartment(self, application_id, change_application_comp "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def change_application_compartment(self, application_id, change_application_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -273,7 +272,7 @@ def create_application(self, create_application_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application got unknown kwargs: {extra_kwargs!r}") @@ -283,7 +282,7 @@ def create_application(self, create_application_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -362,7 +361,7 @@ def create_function(self, create_function_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_function got unknown kwargs: {extra_kwargs!r}") @@ -372,7 +371,7 @@ def create_function(self, create_function_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -459,7 +458,7 @@ def delete_application(self, application_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application got unknown kwargs: {extra_kwargs!r}") @@ -468,10 +467,10 @@ def delete_application(self, application_id, **kwargs): "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -480,7 +479,7 @@ def delete_application(self, application_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -565,7 +564,7 @@ def delete_function(self, function_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_function got unknown kwargs: {extra_kwargs!r}") @@ -574,10 +573,10 @@ def delete_function(self, function_id, **kwargs): "functionId": function_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -586,7 +585,7 @@ def delete_function(self, function_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -665,7 +664,7 @@ def get_application(self, application_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application got unknown kwargs: {extra_kwargs!r}") @@ -674,10 +673,10 @@ def get_application(self, application_id, **kwargs): "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -685,7 +684,7 @@ def get_application(self, application_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -766,7 +765,7 @@ def get_function(self, function_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_function got unknown kwargs: {extra_kwargs!r}") @@ -775,10 +774,10 @@ def get_function(self, function_id, **kwargs): "functionId": function_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -786,7 +785,7 @@ def get_function(self, function_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -865,7 +864,7 @@ def get_pbf_listing(self, pbf_listing_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pbf_listing got unknown kwargs: {extra_kwargs!r}") @@ -874,10 +873,10 @@ def get_pbf_listing(self, pbf_listing_id, **kwargs): "pbfListingId": pbf_listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -885,7 +884,7 @@ def get_pbf_listing(self, pbf_listing_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -964,7 +963,7 @@ def get_pbf_listing_version(self, pbf_listing_version_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pbf_listing_version got unknown kwargs: {extra_kwargs!r}") @@ -973,10 +972,10 @@ def get_pbf_listing_version(self, pbf_listing_version_id, **kwargs): "pbfListingVersionId": pbf_listing_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -984,7 +983,7 @@ def get_pbf_listing_version(self, pbf_listing_version_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1111,7 +1110,7 @@ def list_applications(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_applications got unknown kwargs: {extra_kwargs!r}") @@ -1147,14 +1146,14 @@ def list_applications(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1281,7 +1280,7 @@ def list_functions(self, application_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_functions got unknown kwargs: {extra_kwargs!r}") @@ -1317,14 +1316,14 @@ def list_functions(self, application_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1452,7 +1451,7 @@ def list_pbf_listing_versions(self, pbf_listing_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pbf_listing_versions got unknown kwargs: {extra_kwargs!r}") @@ -1489,14 +1488,14 @@ def list_pbf_listing_versions(self, pbf_listing_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1624,7 +1623,7 @@ def list_pbf_listings(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_pbf_listings got unknown kwargs: {extra_kwargs!r}") @@ -1662,14 +1661,14 @@ def list_pbf_listings(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1768,7 +1767,7 @@ def list_triggers(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_triggers got unknown kwargs: {extra_kwargs!r}") @@ -1786,14 +1785,14 @@ def list_triggers(self, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1883,7 +1882,7 @@ def update_application(self, application_id, update_application_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application got unknown kwargs: {extra_kwargs!r}") @@ -1892,10 +1891,10 @@ def update_application(self, application_id, update_application_details, **kwarg "applicationId": application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1904,7 +1903,7 @@ def update_application(self, application_id, update_application_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1996,7 +1995,7 @@ def update_function(self, function_id, update_function_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_function got unknown kwargs: {extra_kwargs!r}") @@ -2005,10 +2004,10 @@ def update_function(self, function_id, update_function_details, **kwargs): "functionId": function_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2017,7 +2016,7 @@ def update_function(self, function_id, update_function_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/data_masking_activity_client.py b/src/oci/fusion_apps/data_masking_activity_client.py index ba39829e20..0c07b09e52 100644 --- a/src/oci/fusion_apps/data_masking_activity_client.py +++ b/src/oci/fusion_apps/data_masking_activity_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -155,7 +154,7 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_data_masking_activity got unknown kwargs: {!r}".format(extra_kwargs)) @@ -164,10 +163,10 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -176,7 +175,7 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -252,7 +251,7 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_data_masking_activity got unknown kwargs: {!r}".format(extra_kwargs)) @@ -262,10 +261,10 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "dataMaskingActivityId": data_masking_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -273,7 +272,7 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -371,7 +370,7 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_data_masking_activities got unknown kwargs: {!r}".format(extra_kwargs)) @@ -380,10 +379,10 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'lifecycle_state' in kwargs: @@ -414,14 +413,14 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/fusion_applications_client.py b/src/oci/fusion_apps/fusion_applications_client.py index 549a9da299..48568a5767 100644 --- a/src/oci/fusion_apps/fusion_applications_client.py +++ b/src/oci/fusion_apps/fusion_applications_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fusion_environment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fusion_environment_family_compartment got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -321,7 +320,7 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -411,7 +410,7 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_masking_activity got unknown kwargs: {extra_kwargs!r}") @@ -420,10 +419,10 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -432,7 +431,7 @@ def create_data_masking_activity(self, fusion_environment_id, create_data_maskin "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -519,7 +518,7 @@ def create_fusion_environment(self, create_fusion_environment_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fusion_environment got unknown kwargs: {extra_kwargs!r}") @@ -530,7 +529,7 @@ def create_fusion_environment(self, create_fusion_environment_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fusion_environment_admin_user got unknown kwargs: {extra_kwargs!r}") @@ -627,10 +626,10 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -639,7 +638,7 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -726,7 +725,7 @@ def create_fusion_environment_family(self, create_fusion_environment_family_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fusion_environment_family got unknown kwargs: {extra_kwargs!r}") @@ -737,7 +736,7 @@ def create_fusion_environment_family(self, create_fusion_environment_family_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -825,7 +824,7 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_refresh_activity got unknown kwargs: {extra_kwargs!r}") @@ -834,10 +833,10 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -846,7 +845,7 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -936,7 +935,7 @@ def create_service_attachment(self, create_service_attachment_details, fusion_en "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_attachment got unknown kwargs: {extra_kwargs!r}") @@ -945,10 +944,10 @@ def create_service_attachment(self, create_service_attachment_details, fusion_en "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -957,7 +956,7 @@ def create_service_attachment(self, create_service_attachment_details, fusion_en "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1044,7 +1043,7 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fusion_environment got unknown kwargs: {extra_kwargs!r}") @@ -1053,10 +1052,10 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1065,7 +1064,7 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1152,7 +1151,7 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fusion_environment_admin_user got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1174,7 +1173,7 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1258,7 +1257,7 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fusion_environment_family got unknown kwargs: {extra_kwargs!r}") @@ -1267,10 +1266,10 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1279,7 +1278,7 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1366,7 +1365,7 @@ def delete_refresh_activity(self, fusion_environment_id, refresh_activity_id, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_refresh_activity got unknown kwargs: {extra_kwargs!r}") @@ -1376,10 +1375,10 @@ def delete_refresh_activity(self, fusion_environment_id, refresh_activity_id, ** "refreshActivityId": refresh_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1388,7 +1387,7 @@ def delete_refresh_activity(self, fusion_environment_id, refresh_activity_id, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1475,7 +1474,7 @@ def delete_service_attachment(self, fusion_environment_id, service_attachment_id "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1485,10 +1484,10 @@ def delete_service_attachment(self, fusion_environment_id, service_attachment_id "serviceAttachmentId": service_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1497,7 +1496,7 @@ def delete_service_attachment(self, fusion_environment_id, service_attachment_id "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1576,7 +1575,7 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_masking_activity got unknown kwargs: {extra_kwargs!r}") @@ -1586,10 +1585,10 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "dataMaskingActivityId": data_masking_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1597,7 +1596,7 @@ def get_data_masking_activity(self, fusion_environment_id, data_masking_activity "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1675,7 +1674,7 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fusion_environment got unknown kwargs: {extra_kwargs!r}") @@ -1684,10 +1683,10 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1695,7 +1694,7 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1773,7 +1772,7 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fusion_environment_family got unknown kwargs: {extra_kwargs!r}") @@ -1782,10 +1781,10 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1793,7 +1792,7 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1871,7 +1870,7 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fusion_environment_family_limits_and_usage got unknown kwargs: {extra_kwargs!r}") @@ -1880,10 +1879,10 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1891,7 +1890,7 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1969,7 +1968,7 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fusion_environment_family_subscription_detail got unknown kwargs: {extra_kwargs!r}") @@ -1978,10 +1977,10 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1989,7 +1988,7 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2067,7 +2066,7 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fusion_environment_status got unknown kwargs: {extra_kwargs!r}") @@ -2076,10 +2075,10 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2087,7 +2086,7 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2168,7 +2167,7 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_refresh_activity got unknown kwargs: {extra_kwargs!r}") @@ -2178,10 +2177,10 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "refreshActivityId": refresh_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2189,7 +2188,7 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2270,7 +2269,7 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_scheduled_activity got unknown kwargs: {extra_kwargs!r}") @@ -2280,10 +2279,10 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "scheduledActivityId": scheduled_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2291,7 +2290,7 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2372,7 +2371,7 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2382,10 +2381,10 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "serviceAttachmentId": service_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2393,7 +2392,7 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2471,7 +2470,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2480,10 +2479,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2491,7 +2490,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2569,7 +2568,7 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_admin_users got unknown kwargs: {extra_kwargs!r}") @@ -2578,10 +2577,10 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2589,7 +2588,7 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2693,7 +2692,7 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_masking_activities got unknown kwargs: {extra_kwargs!r}") @@ -2702,10 +2701,10 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -2736,14 +2735,14 @@ def list_data_masking_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2857,7 +2856,7 @@ def list_fusion_environment_families(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fusion_environment_families got unknown kwargs: {extra_kwargs!r}") @@ -2893,14 +2892,14 @@ def list_fusion_environment_families(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3012,7 +3011,7 @@ def list_fusion_environments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fusion_environments got unknown kwargs: {extra_kwargs!r}") @@ -3048,14 +3047,14 @@ def list_fusion_environments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3171,7 +3170,7 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_refresh_activities got unknown kwargs: {extra_kwargs!r}") @@ -3180,10 +3179,10 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -3217,14 +3216,14 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3358,7 +3357,7 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scheduled_activities got unknown kwargs: {extra_kwargs!r}") @@ -3367,10 +3366,10 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'run_cycle' in kwargs: @@ -3421,14 +3420,14 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3544,7 +3543,7 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_attachments got unknown kwargs: {extra_kwargs!r}") @@ -3553,10 +3552,10 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -3596,14 +3595,14 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3703,7 +3702,7 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_time_available_for_refreshes got unknown kwargs: {extra_kwargs!r}") @@ -3712,10 +3711,10 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3738,14 +3737,14 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3845,7 +3844,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3854,10 +3853,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -3880,14 +3879,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3987,7 +3986,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3996,10 +3995,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -4022,14 +4021,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4139,7 +4138,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4174,14 +4173,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4281,7 +4280,7 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_fusion_environment_password got unknown kwargs: {extra_kwargs!r}") @@ -4291,10 +4290,10 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "adminUsername": admin_username } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4304,7 +4303,7 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4394,7 +4393,7 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fusion_environment got unknown kwargs: {extra_kwargs!r}") @@ -4403,10 +4402,10 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4415,7 +4414,7 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4504,7 +4503,7 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fusion_environment_family got unknown kwargs: {extra_kwargs!r}") @@ -4513,10 +4512,10 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4525,7 +4524,7 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4617,7 +4616,7 @@ def update_refresh_activity(self, fusion_environment_id, refresh_activity_id, up "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_refresh_activity got unknown kwargs: {extra_kwargs!r}") @@ -4627,10 +4626,10 @@ def update_refresh_activity(self, fusion_environment_id, refresh_activity_id, up "refreshActivityId": refresh_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4639,7 +4638,7 @@ def update_refresh_activity(self, fusion_environment_id, refresh_activity_id, up "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4722,7 +4721,7 @@ def verify_service_attachment(self, verify_service_attachment_details, fusion_en "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"verify_service_attachment got unknown kwargs: {extra_kwargs!r}") @@ -4731,10 +4730,10 @@ def verify_service_attachment(self, verify_service_attachment_details, fusion_en "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4742,7 +4741,7 @@ def verify_service_attachment(self, verify_service_attachment_details, fusion_en "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/fusion_environment_client.py b/src/oci/fusion_apps/fusion_environment_client.py index 4c0de625e6..5d7c19c556 100644 --- a/src/oci/fusion_apps/fusion_environment_client.py +++ b/src/oci/fusion_apps/fusion_environment_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -164,7 +163,7 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_fusion_environment_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -173,10 +172,10 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -186,7 +185,7 @@ def change_fusion_environment_compartment(self, fusion_environment_id, change_fu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -267,7 +266,7 @@ def create_fusion_environment(self, create_fusion_environment_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_fusion_environment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -278,7 +277,7 @@ def create_fusion_environment(self, create_fusion_environment_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -360,7 +359,7 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_fusion_environment_admin_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -369,10 +368,10 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -381,7 +380,7 @@ def create_fusion_environment_admin_user(self, create_fusion_environment_admin_u "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -462,7 +461,7 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_fusion_environment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -471,10 +470,10 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -483,7 +482,7 @@ def delete_fusion_environment(self, fusion_environment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_fusion_environment_admin_user got unknown kwargs: {!r}".format(extra_kwargs)) @@ -574,10 +573,10 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -586,7 +585,7 @@ def delete_fusion_environment_admin_user(self, admin_username, fusion_environmen "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -656,7 +655,7 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fusion_environment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -665,10 +664,10 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -676,7 +675,7 @@ def get_fusion_environment(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -748,7 +747,7 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fusion_environment_status got unknown kwargs: {!r}".format(extra_kwargs)) @@ -757,10 +756,10 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -768,7 +767,7 @@ def get_fusion_environment_status(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -840,7 +839,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_work_request got unknown kwargs: {!r}".format(extra_kwargs)) @@ -849,10 +848,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -860,7 +859,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -932,7 +931,7 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_admin_users got unknown kwargs: {!r}".format(extra_kwargs)) @@ -941,10 +940,10 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -952,7 +951,7 @@ def list_admin_users(self, fusion_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1058,7 +1057,7 @@ def list_fusion_environments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_fusion_environments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1094,14 +1093,14 @@ def list_fusion_environments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1193,7 +1192,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_errors got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1202,10 +1201,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_by' in kwargs: @@ -1228,14 +1227,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1329,7 +1328,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_request_logs got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1338,10 +1337,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_by' in kwargs: @@ -1364,14 +1363,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1475,7 +1474,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_work_requests got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1510,14 +1509,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1611,7 +1610,7 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "reset_fusion_environment_password got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1621,10 +1620,10 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "adminUsername": admin_username } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -1634,7 +1633,7 @@ def reset_fusion_environment_password(self, reset_fusion_environment_password_de "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1718,7 +1717,7 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_fusion_environment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -1727,10 +1726,10 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -1739,7 +1738,7 @@ def update_fusion_environment(self, fusion_environment_id, update_fusion_environ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/fusion_environment_family_client.py b/src/oci/fusion_apps/fusion_environment_family_client.py index 67107bacb3..4eec522701 100644 --- a/src/oci/fusion_apps/fusion_environment_family_client.py +++ b/src/oci/fusion_apps/fusion_environment_family_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -164,7 +163,7 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "change_fusion_environment_family_compartment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -173,10 +172,10 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -186,7 +185,7 @@ def change_fusion_environment_family_compartment(self, fusion_environment_family "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def create_fusion_environment_family(self, create_fusion_environment_family_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_fusion_environment_family got unknown kwargs: {!r}".format(extra_kwargs)) @@ -283,7 +282,7 @@ def create_fusion_environment_family(self, create_fusion_environment_family_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -362,7 +361,7 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "delete_fusion_environment_family got unknown kwargs: {!r}".format(extra_kwargs)) @@ -371,10 +370,10 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -383,7 +382,7 @@ def delete_fusion_environment_family(self, fusion_environment_family_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -453,7 +452,7 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fusion_environment_family got unknown kwargs: {!r}".format(extra_kwargs)) @@ -462,10 +461,10 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -473,7 +472,7 @@ def get_fusion_environment_family(self, fusion_environment_family_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -545,7 +544,7 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fusion_environment_family_limits_and_usage got unknown kwargs: {!r}".format(extra_kwargs)) @@ -554,10 +553,10 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -565,7 +564,7 @@ def get_fusion_environment_family_limits_and_usage(self, fusion_environment_fami "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -637,7 +636,7 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_fusion_environment_family_subscription_detail got unknown kwargs: {!r}".format(extra_kwargs)) @@ -646,10 +645,10 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -657,7 +656,7 @@ def get_fusion_environment_family_subscription_detail(self, fusion_environment_f "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -763,7 +762,7 @@ def list_fusion_environment_families(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_fusion_environment_families got unknown kwargs: {!r}".format(extra_kwargs)) @@ -799,14 +798,14 @@ def list_fusion_environment_families(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -889,7 +888,7 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "update_fusion_environment_family got unknown kwargs: {!r}".format(extra_kwargs)) @@ -898,10 +897,10 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "fusionEnvironmentFamilyId": fusion_environment_family_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -910,7 +909,7 @@ def update_fusion_environment_family(self, fusion_environment_family_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/refresh_activity_client.py b/src/oci/fusion_apps/refresh_activity_client.py index cc31d5a6e6..0930448454 100644 --- a/src/oci/fusion_apps/refresh_activity_client.py +++ b/src/oci/fusion_apps/refresh_activity_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -155,7 +154,7 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "create_refresh_activity got unknown kwargs: {!r}".format(extra_kwargs)) @@ -164,10 +163,10 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -176,7 +175,7 @@ def create_refresh_activity(self, fusion_environment_id, create_refresh_activity "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -252,7 +251,7 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_refresh_activity got unknown kwargs: {!r}".format(extra_kwargs)) @@ -262,10 +261,10 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "refreshActivityId": refresh_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -273,7 +272,7 @@ def get_refresh_activity(self, fusion_environment_id, refresh_activity_id, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_refresh_activities got unknown kwargs: {!r}".format(extra_kwargs)) @@ -392,10 +391,10 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'lifecycle_state' in kwargs: @@ -429,14 +428,14 @@ def list_refresh_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -530,7 +529,7 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_time_available_for_refreshes got unknown kwargs: {!r}".format(extra_kwargs)) @@ -539,10 +538,10 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'sort_order' in kwargs: @@ -565,14 +564,14 @@ def list_time_available_for_refreshes(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/scheduled_activity_client.py b/src/oci/fusion_apps/scheduled_activity_client.py index 0527c1870d..6def9fa51e 100644 --- a/src/oci/fusion_apps/scheduled_activity_client.py +++ b/src/oci/fusion_apps/scheduled_activity_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -147,7 +146,7 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_scheduled_activity got unknown kwargs: {!r}".format(extra_kwargs)) @@ -157,10 +156,10 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "scheduledActivityId": scheduled_activity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -168,7 +167,7 @@ def get_scheduled_activity(self, fusion_environment_id, scheduled_activity_id, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_scheduled_activities got unknown kwargs: {!r}".format(extra_kwargs)) @@ -293,10 +292,10 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'run_cycle' in kwargs: @@ -338,14 +337,14 @@ def list_scheduled_activities(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/fusion_apps/service_attachment_client.py b/src/oci/fusion_apps/service_attachment_client.py index 88a6a152da..aab1c73144 100644 --- a/src/oci/fusion_apps/service_attachment_client.py +++ b/src/oci/fusion_apps/service_attachment_client.py @@ -5,7 +5,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -147,7 +146,7 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "get_service_attachment got unknown kwargs: {!r}".format(extra_kwargs)) @@ -157,10 +156,10 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "serviceAttachmentId": service_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) header_params = { @@ -168,7 +167,7 @@ def get_service_attachment(self, fusion_environment_id, service_attachment_id, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -276,7 +275,7 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( "list_service_attachments got unknown kwargs: {!r}".format(extra_kwargs)) @@ -285,10 +284,10 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "fusionEnvironmentId": fusion_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) if 'lifecycle_state' in kwargs: @@ -328,14 +327,14 @@ def list_service_attachments(self, fusion_environment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/generative_ai/generative_ai_client.py b/src/oci/generative_ai/generative_ai_client.py index 3b53fa06be..97587e83a9 100644 --- a/src/oci/generative_ai/generative_ai_client.py +++ b/src/oci/generative_ai/generative_ai_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -189,7 +188,7 @@ def change_dedicated_ai_cluster_compartment(self, dedicated_ai_cluster_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_dedicated_ai_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -198,10 +197,10 @@ def change_dedicated_ai_cluster_compartment(self, dedicated_ai_cluster_id, chang "dedicatedAiClusterId": dedicated_ai_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -211,7 +210,7 @@ def change_dedicated_ai_cluster_compartment(self, dedicated_ai_cluster_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -315,7 +314,7 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -324,10 +323,10 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -337,7 +336,7 @@ def change_endpoint_compartment(self, endpoint_id, change_endpoint_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -439,7 +438,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -448,10 +447,10 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -461,7 +460,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -551,7 +550,7 @@ def create_dedicated_ai_cluster(self, create_dedicated_ai_cluster_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dedicated_ai_cluster got unknown kwargs: {extra_kwargs!r}") @@ -562,7 +561,7 @@ def create_dedicated_ai_cluster(self, create_dedicated_ai_cluster_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -654,7 +653,7 @@ def create_endpoint(self, create_endpoint_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -665,7 +664,7 @@ def create_endpoint(self, create_endpoint_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -757,7 +756,7 @@ def create_model(self, create_model_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_model got unknown kwargs: {extra_kwargs!r}") @@ -768,7 +767,7 @@ def create_model(self, create_model_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -861,7 +860,7 @@ def delete_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dedicated_ai_cluster got unknown kwargs: {extra_kwargs!r}") @@ -870,10 +869,10 @@ def delete_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "dedicatedAiClusterId": dedicated_ai_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -882,7 +881,7 @@ def delete_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -970,7 +969,7 @@ def delete_endpoint(self, endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -979,10 +978,10 @@ def delete_endpoint(self, endpoint_id, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -991,7 +990,7 @@ def delete_endpoint(self, endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1077,7 +1076,7 @@ def delete_model(self, model_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_model got unknown kwargs: {extra_kwargs!r}") @@ -1086,10 +1085,10 @@ def delete_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1098,7 +1097,7 @@ def delete_model(self, model_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1179,7 +1178,7 @@ def get_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dedicated_ai_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1188,10 +1187,10 @@ def get_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "dedicatedAiClusterId": dedicated_ai_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1199,7 +1198,7 @@ def get_dedicated_ai_cluster(self, dedicated_ai_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1282,7 +1281,7 @@ def get_endpoint(self, endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1291,10 +1290,10 @@ def get_endpoint(self, endpoint_id, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1302,7 +1301,7 @@ def get_endpoint(self, endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1383,7 +1382,7 @@ def get_model(self, model_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_model got unknown kwargs: {extra_kwargs!r}") @@ -1392,10 +1391,10 @@ def get_model(self, model_id, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1403,7 +1402,7 @@ def get_model(self, model_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1486,7 +1485,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1495,10 +1494,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1506,7 +1505,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1634,7 +1633,7 @@ def list_dedicated_ai_clusters(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dedicated_ai_clusters got unknown kwargs: {extra_kwargs!r}") @@ -1670,14 +1669,14 @@ def list_dedicated_ai_clusters(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1805,7 +1804,7 @@ def list_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -1841,14 +1840,14 @@ def list_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1983,7 +1982,7 @@ def list_models(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_models got unknown kwargs: {extra_kwargs!r}") @@ -2029,14 +2028,14 @@ def list_models(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2147,7 +2146,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2156,10 +2155,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2182,14 +2181,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2302,7 +2301,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2311,10 +2310,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2337,14 +2336,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2475,7 +2474,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2511,14 +2510,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2611,7 +2610,7 @@ def update_dedicated_ai_cluster(self, dedicated_ai_cluster_id, update_dedicated_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dedicated_ai_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2620,10 +2619,10 @@ def update_dedicated_ai_cluster(self, dedicated_ai_cluster_id, update_dedicated_ "dedicatedAiClusterId": dedicated_ai_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2632,7 +2631,7 @@ def update_dedicated_ai_cluster(self, dedicated_ai_cluster_id, update_dedicated_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2727,7 +2726,7 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2736,10 +2735,10 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "endpointId": endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2748,7 +2747,7 @@ def update_endpoint(self, endpoint_id, update_endpoint_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2841,7 +2840,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_model got unknown kwargs: {extra_kwargs!r}") @@ -2850,10 +2849,10 @@ def update_model(self, model_id, update_model_details, **kwargs): "modelId": model_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2862,7 +2861,7 @@ def update_model(self, model_id, update_model_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/generative_ai_inference/generative_ai_inference_client.py b/src/oci/generative_ai_inference/generative_ai_inference_client.py index 300b86c750..59f1deb71a 100644 --- a/src/oci/generative_ai_inference/generative_ai_inference_client.py +++ b/src/oci/generative_ai_inference/generative_ai_inference_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def chat(self, chat_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"chat got unknown kwargs: {extra_kwargs!r}") @@ -183,7 +182,7 @@ def chat(self, chat_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -272,7 +271,7 @@ def embed_text(self, embed_text_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"embed_text got unknown kwargs: {extra_kwargs!r}") @@ -283,7 +282,7 @@ def embed_text(self, embed_text_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -370,7 +369,7 @@ def generate_text(self, generate_text_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_text got unknown kwargs: {extra_kwargs!r}") @@ -381,7 +380,7 @@ def generate_text(self, generate_text_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -468,7 +467,7 @@ def summarize_text(self, summarize_text_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_text got unknown kwargs: {extra_kwargs!r}") @@ -479,7 +478,7 @@ def summarize_text(self, summarize_text_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/generic_artifacts_content/generic_artifacts_content_client.py b/src/oci/generic_artifacts_content/generic_artifacts_content_client.py index 28624e921d..88f7af7c2d 100644 --- a/src/oci/generic_artifacts_content/generic_artifacts_content_client.py +++ b/src/oci/generic_artifacts_content/generic_artifacts_content_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def get_generic_artifact_content(self, artifact_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_generic_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def get_generic_artifact_content(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def get_generic_artifact_content(self, artifact_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def get_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_generic_artifact_content_by_path got unknown kwargs: {extra_kwargs!r}") @@ -295,10 +294,10 @@ def get_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "version": version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -306,7 +305,7 @@ def get_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -416,7 +415,7 @@ def put_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_generic_artifact_content_by_path got unknown kwargs: {extra_kwargs!r}") @@ -427,10 +426,10 @@ def put_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "version": version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -438,7 +437,7 @@ def put_generic_artifact_content_by_path(self, repository_id, artifact_path, ver "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -447,7 +446,7 @@ def put_generic_artifact_content_by_path(self, repository_id, artifact_path, ver generic_artifact_content_body = kwargs.get("generic_artifact_content_body", missing) if generic_artifact_content_body is not missing and generic_artifact_content_body is not None: - if (not isinstance(generic_artifact_content_body, (six.binary_type, six.string_types)) and + if (not isinstance(generic_artifact_content_body, (bytes, str)) and not hasattr(generic_artifact_content_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/globally_distributed_database/sharded_database_service_client.py b/src/oci/globally_distributed_database/sharded_database_service_client.py index 7aa91dffc3..3681c8bdee 100644 --- a/src/oci/globally_distributed_database/sharded_database_service_client.py +++ b/src/oci/globally_distributed_database/sharded_database_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_private_endpoint_compartment(self, change_private_endpoint_compartmen "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_private_endpoint_compartment(self, change_private_endpoint_compartmen "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_private_endpoint_compartment(self, change_private_endpoint_compartmen "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -297,7 +296,7 @@ def change_sharded_database_compartment(self, change_sharded_database_compartmen "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sharded_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -306,10 +305,10 @@ def change_sharded_database_compartment(self, change_sharded_database_compartmen "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -319,7 +318,7 @@ def change_sharded_database_compartment(self, change_sharded_database_compartmen "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -420,7 +419,7 @@ def configure_sharded_database_gsms(self, configure_sharded_database_gsms_detail "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_sharded_database_gsms got unknown kwargs: {extra_kwargs!r}") @@ -429,10 +428,10 @@ def configure_sharded_database_gsms(self, configure_sharded_database_gsms_detail "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -442,7 +441,7 @@ def configure_sharded_database_gsms(self, configure_sharded_database_gsms_detail "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -546,7 +545,7 @@ def configure_sharding(self, sharded_database_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_sharding got unknown kwargs: {extra_kwargs!r}") @@ -555,16 +554,16 @@ def configure_sharding(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isRebalanceRequired": kwargs.get("is_rebalance_required", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -573,7 +572,7 @@ def configure_sharding(self, sharded_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -660,7 +659,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -671,7 +670,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -758,7 +757,7 @@ def create_sharded_database(self, create_sharded_database_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -769,7 +768,7 @@ def create_sharded_database(self, create_sharded_database_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -864,7 +863,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -873,10 +872,10 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -886,7 +885,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -979,7 +978,7 @@ def delete_sharded_database(self, sharded_database_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -988,10 +987,10 @@ def delete_sharded_database(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1001,7 +1000,7 @@ def delete_sharded_database(self, sharded_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1097,7 +1096,7 @@ def download_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1106,10 +1105,10 @@ def download_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1119,7 +1118,7 @@ def download_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1214,7 +1213,7 @@ def fetch_connection_string(self, sharded_database_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fetch_connection_string got unknown kwargs: {extra_kwargs!r}") @@ -1223,10 +1222,10 @@ def fetch_connection_string(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1236,7 +1235,7 @@ def fetch_connection_string(self, sharded_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1323,7 +1322,7 @@ def fetch_shardable_cloud_autonomous_vm_clusters(self, fetch_shardable_cloud_aut "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fetch_shardable_cloud_autonomous_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -1334,7 +1333,7 @@ def fetch_shardable_cloud_autonomous_vm_clusters(self, fetch_shardable_cloud_aut "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1431,7 +1430,7 @@ def generate_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1440,10 +1439,10 @@ def generate_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1453,7 +1452,7 @@ def generate_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1549,7 +1548,7 @@ def generate_wallet(self, sharded_database_id, generate_wallet_details, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_wallet got unknown kwargs: {extra_kwargs!r}") @@ -1558,10 +1557,10 @@ def generate_wallet(self, sharded_database_id, generate_wallet_details, **kwargs "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1571,7 +1570,7 @@ def generate_wallet(self, sharded_database_id, generate_wallet_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1652,7 +1651,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1661,10 +1660,10 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1672,7 +1671,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1755,7 +1754,7 @@ def get_sharded_database(self, sharded_database_id, **kwargs): "metadata", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -1764,23 +1763,23 @@ def get_sharded_database(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "metadata": kwargs.get("metadata", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1860,7 +1859,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1869,10 +1868,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1880,7 +1879,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1988,7 +1987,7 @@ def list_private_endpoints(self, compartment_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -2023,14 +2022,14 @@ def list_private_endpoints(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2138,7 +2137,7 @@ def list_sharded_databases(self, compartment_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sharded_databases got unknown kwargs: {extra_kwargs!r}") @@ -2173,14 +2172,14 @@ def list_sharded_databases(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2278,7 +2277,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2287,10 +2286,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2313,14 +2312,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2420,7 +2419,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2429,10 +2428,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2455,14 +2454,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2576,7 +2575,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2612,14 +2611,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2710,7 +2709,7 @@ def patch_sharded_database(self, sharded_database_id, patch_sharded_database_det "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -2719,10 +2718,10 @@ def patch_sharded_database(self, sharded_database_id, patch_sharded_database_det "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2731,7 +2730,7 @@ def patch_sharded_database(self, sharded_database_id, patch_sharded_database_det "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2820,7 +2819,7 @@ def prevalidate_sharded_database(self, compartment_id, prevalidate_sharded_datab "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"prevalidate_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -2828,7 +2827,7 @@ def prevalidate_sharded_database(self, compartment_id, prevalidate_sharded_datab query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2836,7 +2835,7 @@ def prevalidate_sharded_database(self, compartment_id, prevalidate_sharded_datab "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2933,7 +2932,7 @@ def start_sharded_database(self, sharded_database_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -2942,10 +2941,10 @@ def start_sharded_database(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2955,7 +2954,7 @@ def start_sharded_database(self, sharded_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3048,7 +3047,7 @@ def stop_sharded_database(self, sharded_database_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -3057,10 +3056,10 @@ def stop_sharded_database(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3070,7 +3069,7 @@ def stop_sharded_database(self, sharded_database_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3166,7 +3165,7 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3175,10 +3174,10 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3188,7 +3187,7 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3280,7 +3279,7 @@ def update_sharded_database(self, sharded_database_id, update_sharded_database_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -3289,10 +3288,10 @@ def update_sharded_database(self, sharded_database_id, update_sharded_database_d "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3301,7 +3300,7 @@ def update_sharded_database(self, sharded_database_id, update_sharded_database_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3403,7 +3402,7 @@ def upload_signed_certificate_and_generate_wallet(self, sharded_database_id, upl "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_signed_certificate_and_generate_wallet got unknown kwargs: {extra_kwargs!r}") @@ -3412,10 +3411,10 @@ def upload_signed_certificate_and_generate_wallet(self, sharded_database_id, upl "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3425,7 +3424,7 @@ def upload_signed_certificate_and_generate_wallet(self, sharded_database_id, upl "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3532,7 +3531,7 @@ def validate_network(self, sharded_database_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_network got unknown kwargs: {extra_kwargs!r}") @@ -3541,10 +3540,10 @@ def validate_network(self, sharded_database_id, **kwargs): "shardedDatabaseId": sharded_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3552,7 +3551,7 @@ def validate_network(self, sharded_database_id, **kwargs): "resourceName": kwargs.get("resource_name", missing), "isPrimary": kwargs.get("is_primary", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3561,7 +3560,7 @@ def validate_network(self, sharded_database_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/golden_gate/golden_gate_client.py b/src/oci/golden_gate/golden_gate_client.py index 05ac47aeec..03435168e1 100644 --- a/src/oci/golden_gate/golden_gate_client.py +++ b/src/oci/golden_gate/golden_gate_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def cancel_deployment_backup(self, deployment_backup_id, cancel_deployment_backu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def cancel_deployment_backup(self, deployment_backup_id, cancel_deployment_backu "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def cancel_deployment_backup(self, deployment_backup_id, cancel_deployment_backu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -293,7 +292,7 @@ def cancel_deployment_upgrade(self, deployment_upgrade_id, cancel_deployment_upg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -302,10 +301,10 @@ def cancel_deployment_upgrade(self, deployment_upgrade_id, cancel_deployment_upg "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -315,7 +314,7 @@ def cancel_deployment_upgrade(self, deployment_upgrade_id, cancel_deployment_upg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -413,7 +412,7 @@ def cancel_snooze_deployment_upgrade(self, deployment_upgrade_id, cancel_snooze_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_snooze_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -422,10 +421,10 @@ def cancel_snooze_deployment_upgrade(self, deployment_upgrade_id, cancel_snooze_ "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -435,7 +434,7 @@ def cancel_snooze_deployment_upgrade(self, deployment_upgrade_id, cancel_snooze_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -531,7 +530,7 @@ def change_connection_compartment(self, connection_id, change_connection_compart "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -540,10 +539,10 @@ def change_connection_compartment(self, connection_id, change_connection_compart "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -552,7 +551,7 @@ def change_connection_compartment(self, connection_id, change_connection_compart "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -653,7 +652,7 @@ def change_database_registration_compartment(self, database_registration_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_registration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def change_database_registration_compartment(self, database_registration_id, cha "databaseRegistrationId": database_registration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -675,7 +674,7 @@ def change_database_registration_compartment(self, database_registration_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -776,7 +775,7 @@ def change_deployment_backup_compartment(self, deployment_backup_id, change_depl "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_deployment_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def change_deployment_backup_compartment(self, deployment_backup_id, change_depl "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -798,7 +797,7 @@ def change_deployment_backup_compartment(self, deployment_backup_id, change_depl "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -899,7 +898,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -908,10 +907,10 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -921,7 +920,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1017,7 +1016,7 @@ def collect_deployment_diagnostic(self, deployment_id, collect_deployment_diagno "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"collect_deployment_diagnostic got unknown kwargs: {extra_kwargs!r}") @@ -1026,10 +1025,10 @@ def collect_deployment_diagnostic(self, deployment_id, collect_deployment_diagno "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1039,7 +1038,7 @@ def collect_deployment_diagnostic(self, deployment_id, collect_deployment_diagno "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1135,7 +1134,7 @@ def copy_deployment_backup(self, deployment_backup_id, copy_deployment_backup_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"copy_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -1144,10 +1143,10 @@ def copy_deployment_backup(self, deployment_backup_id, copy_deployment_backup_de "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1157,7 +1156,7 @@ def copy_deployment_backup(self, deployment_backup_id, copy_deployment_backup_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1246,7 +1245,7 @@ def create_certificate(self, create_certificate_details, deployment_id, **kwargs "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1255,10 +1254,10 @@ def create_certificate(self, create_certificate_details, deployment_id, **kwargs "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1267,7 +1266,7 @@ def create_certificate(self, create_certificate_details, deployment_id, **kwargs "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1353,7 +1352,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection got unknown kwargs: {extra_kwargs!r}") @@ -1364,7 +1363,7 @@ def create_connection(self, create_connection_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1450,7 +1449,7 @@ def create_connection_assignment(self, create_connection_assignment_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -1461,7 +1460,7 @@ def create_connection_assignment(self, create_connection_assignment_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1548,7 +1547,7 @@ def create_database_registration(self, create_database_registration_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database_registration got unknown kwargs: {extra_kwargs!r}") @@ -1559,7 +1558,7 @@ def create_database_registration(self, create_database_registration_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1645,7 +1644,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deployment got unknown kwargs: {extra_kwargs!r}") @@ -1656,7 +1655,7 @@ def create_deployment(self, create_deployment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1742,7 +1741,7 @@ def create_deployment_backup(self, create_deployment_backup_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -1753,7 +1752,7 @@ def create_deployment_backup(self, create_deployment_backup_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1840,7 +1839,7 @@ def delete_certificate(self, deployment_id, certificate_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1850,10 +1849,10 @@ def delete_certificate(self, deployment_id, certificate_key, **kwargs): "certificateKey": certificate_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1862,7 +1861,7 @@ def delete_certificate(self, deployment_id, certificate_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1947,7 +1946,7 @@ def delete_connection(self, connection_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection got unknown kwargs: {extra_kwargs!r}") @@ -1956,10 +1955,10 @@ def delete_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1968,7 +1967,7 @@ def delete_connection(self, connection_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2053,7 +2052,7 @@ def delete_connection_assignment(self, connection_assignment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -2062,10 +2061,10 @@ def delete_connection_assignment(self, connection_assignment_id, **kwargs): "connectionAssignmentId": connection_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2074,7 +2073,7 @@ def delete_connection_assignment(self, connection_assignment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2158,7 +2157,7 @@ def delete_database_registration(self, database_registration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database_registration got unknown kwargs: {extra_kwargs!r}") @@ -2167,10 +2166,10 @@ def delete_database_registration(self, database_registration_id, **kwargs): "databaseRegistrationId": database_registration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2179,7 +2178,7 @@ def delete_database_registration(self, database_registration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2262,7 +2261,7 @@ def delete_deployment(self, deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deployment got unknown kwargs: {extra_kwargs!r}") @@ -2271,10 +2270,10 @@ def delete_deployment(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2283,7 +2282,7 @@ def delete_deployment(self, deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2366,7 +2365,7 @@ def delete_deployment_backup(self, deployment_backup_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -2375,10 +2374,10 @@ def delete_deployment_backup(self, deployment_backup_id, **kwargs): "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2387,7 +2386,7 @@ def delete_deployment_backup(self, deployment_backup_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2480,7 +2479,7 @@ def deployment_wallet_exists(self, deployment_id, deployment_wallet_exists_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deployment_wallet_exists got unknown kwargs: {extra_kwargs!r}") @@ -2489,10 +2488,10 @@ def deployment_wallet_exists(self, deployment_id, deployment_wallet_exists_detai "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2502,7 +2501,7 @@ def deployment_wallet_exists(self, deployment_id, deployment_wallet_exists_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2600,7 +2599,7 @@ def export_deployment_wallet(self, deployment_id, export_deployment_wallet_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_deployment_wallet got unknown kwargs: {extra_kwargs!r}") @@ -2609,10 +2608,10 @@ def export_deployment_wallet(self, deployment_id, export_deployment_wallet_detai "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2622,7 +2621,7 @@ def export_deployment_wallet(self, deployment_id, export_deployment_wallet_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2704,7 +2703,7 @@ def get_certificate(self, deployment_id, certificate_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2714,10 +2713,10 @@ def get_certificate(self, deployment_id, certificate_key, **kwargs): "certificateKey": certificate_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2725,7 +2724,7 @@ def get_certificate(self, deployment_id, certificate_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2805,7 +2804,7 @@ def get_connection(self, connection_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection got unknown kwargs: {extra_kwargs!r}") @@ -2814,10 +2813,10 @@ def get_connection(self, connection_id, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2825,7 +2824,7 @@ def get_connection(self, connection_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2905,7 +2904,7 @@ def get_connection_assignment(self, connection_assignment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -2914,10 +2913,10 @@ def get_connection_assignment(self, connection_assignment_id, **kwargs): "connectionAssignmentId": connection_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2925,7 +2924,7 @@ def get_connection_assignment(self, connection_assignment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3004,7 +3003,7 @@ def get_database_registration(self, database_registration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_registration got unknown kwargs: {extra_kwargs!r}") @@ -3013,10 +3012,10 @@ def get_database_registration(self, database_registration_id, **kwargs): "databaseRegistrationId": database_registration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3024,7 +3023,7 @@ def get_database_registration(self, database_registration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3102,7 +3101,7 @@ def get_deployment(self, deployment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deployment got unknown kwargs: {extra_kwargs!r}") @@ -3111,10 +3110,10 @@ def get_deployment(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3122,7 +3121,7 @@ def get_deployment(self, deployment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3200,7 +3199,7 @@ def get_deployment_backup(self, deployment_backup_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -3209,10 +3208,10 @@ def get_deployment_backup(self, deployment_backup_id, **kwargs): "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3220,7 +3219,7 @@ def get_deployment_backup(self, deployment_backup_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3298,7 +3297,7 @@ def get_deployment_upgrade(self, deployment_upgrade_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -3307,10 +3306,10 @@ def get_deployment_upgrade(self, deployment_upgrade_id, **kwargs): "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3318,7 +3317,7 @@ def get_deployment_upgrade(self, deployment_upgrade_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3398,7 +3397,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3407,10 +3406,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3418,7 +3417,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3513,7 +3512,7 @@ def import_deployment_wallet(self, deployment_id, import_deployment_wallet_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_deployment_wallet got unknown kwargs: {extra_kwargs!r}") @@ -3522,10 +3521,10 @@ def import_deployment_wallet(self, deployment_id, import_deployment_wallet_detai "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3535,7 +3534,7 @@ def import_deployment_wallet(self, deployment_id, import_deployment_wallet_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3643,7 +3642,7 @@ def list_certificates(self, deployment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificates got unknown kwargs: {extra_kwargs!r}") @@ -3652,10 +3651,10 @@ def list_certificates(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -3686,14 +3685,14 @@ def list_certificates(self, deployment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3821,7 +3820,7 @@ def list_connection_assignments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connection_assignments got unknown kwargs: {extra_kwargs!r}") @@ -3858,14 +3857,14 @@ def list_connection_assignments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4005,7 +4004,7 @@ def list_connections(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connections got unknown kwargs: {extra_kwargs!r}") @@ -4068,14 +4067,14 @@ def list_connections(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4190,7 +4189,7 @@ def list_database_registrations(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_registrations got unknown kwargs: {extra_kwargs!r}") @@ -4225,14 +4224,14 @@ def list_database_registrations(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4352,7 +4351,7 @@ def list_deployment_backups(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployment_backups got unknown kwargs: {extra_kwargs!r}") @@ -4388,14 +4387,14 @@ def list_deployment_backups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4513,7 +4512,7 @@ def list_deployment_types(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployment_types got unknown kwargs: {extra_kwargs!r}") @@ -4549,14 +4548,14 @@ def list_deployment_types(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4676,7 +4675,7 @@ def list_deployment_upgrades(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployment_upgrades got unknown kwargs: {extra_kwargs!r}") @@ -4712,14 +4711,14 @@ def list_deployment_upgrades(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4835,7 +4834,7 @@ def list_deployment_versions(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployment_versions got unknown kwargs: {extra_kwargs!r}") @@ -4870,14 +4869,14 @@ def list_deployment_versions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4981,7 +4980,7 @@ def list_deployment_wallets_operations(self, deployment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployment_wallets_operations got unknown kwargs: {extra_kwargs!r}") @@ -4990,10 +4989,10 @@ def list_deployment_wallets_operations(self, deployment_id, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -5017,14 +5016,14 @@ def list_deployment_wallets_operations(self, deployment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5164,7 +5163,7 @@ def list_deployments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_deployments got unknown kwargs: {extra_kwargs!r}") @@ -5218,14 +5217,14 @@ def list_deployments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5312,7 +5311,7 @@ def list_messages(self, deployment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_messages got unknown kwargs: {extra_kwargs!r}") @@ -5322,14 +5321,14 @@ def list_messages(self, deployment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5438,7 +5437,7 @@ def list_trail_files(self, deployment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_trail_files got unknown kwargs: {extra_kwargs!r}") @@ -5466,14 +5465,14 @@ def list_trail_files(self, deployment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5585,7 +5584,7 @@ def list_trail_sequences(self, deployment_id, trail_file_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_trail_sequences got unknown kwargs: {extra_kwargs!r}") @@ -5614,14 +5613,14 @@ def list_trail_sequences(self, deployment_id, trail_file_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5710,7 +5709,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -5719,24 +5718,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5827,7 +5826,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -5836,24 +5835,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5951,7 +5950,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5962,14 +5961,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6064,7 +6063,7 @@ def reschedule_deployment_upgrade(self, deployment_upgrade_id, reschedule_deploy "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reschedule_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -6073,10 +6072,10 @@ def reschedule_deployment_upgrade(self, deployment_upgrade_id, reschedule_deploy "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6086,7 +6085,7 @@ def reschedule_deployment_upgrade(self, deployment_upgrade_id, reschedule_deploy "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6184,7 +6183,7 @@ def restore_deployment(self, deployment_backup_id, restore_deployment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_deployment got unknown kwargs: {extra_kwargs!r}") @@ -6193,10 +6192,10 @@ def restore_deployment(self, deployment_backup_id, restore_deployment_details, * "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6206,7 +6205,7 @@ def restore_deployment(self, deployment_backup_id, restore_deployment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6302,7 +6301,7 @@ def rollback_deployment_upgrade(self, deployment_upgrade_id, rollback_deployment "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rollback_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -6311,10 +6310,10 @@ def rollback_deployment_upgrade(self, deployment_upgrade_id, rollback_deployment "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6324,7 +6323,7 @@ def rollback_deployment_upgrade(self, deployment_upgrade_id, rollback_deployment "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6420,7 +6419,7 @@ def snooze_deployment_upgrade(self, deployment_upgrade_id, snooze_deployment_upg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"snooze_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -6429,10 +6428,10 @@ def snooze_deployment_upgrade(self, deployment_upgrade_id, snooze_deployment_upg "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6442,7 +6441,7 @@ def snooze_deployment_upgrade(self, deployment_upgrade_id, snooze_deployment_upg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6538,7 +6537,7 @@ def start_deployment(self, deployment_id, start_deployment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_deployment got unknown kwargs: {extra_kwargs!r}") @@ -6547,10 +6546,10 @@ def start_deployment(self, deployment_id, start_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6560,7 +6559,7 @@ def start_deployment(self, deployment_id, start_deployment_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6656,7 +6655,7 @@ def stop_deployment(self, deployment_id, stop_deployment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_deployment got unknown kwargs: {extra_kwargs!r}") @@ -6665,10 +6664,10 @@ def stop_deployment(self, deployment_id, stop_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6678,7 +6677,7 @@ def stop_deployment(self, deployment_id, stop_deployment_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6777,7 +6776,7 @@ def test_connection_assignment(self, connection_assignment_id, test_connection_a "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -6786,10 +6785,10 @@ def test_connection_assignment(self, connection_assignment_id, test_connection_a "connectionAssignmentId": connection_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6799,7 +6798,7 @@ def test_connection_assignment(self, connection_assignment_id, test_connection_a "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6892,7 +6891,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connection got unknown kwargs: {extra_kwargs!r}") @@ -6901,10 +6900,10 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "connectionId": connection_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6913,7 +6912,7 @@ def update_connection(self, connection_id, update_connection_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7002,7 +7001,7 @@ def update_database_registration(self, database_registration_id, update_database "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_registration got unknown kwargs: {extra_kwargs!r}") @@ -7011,10 +7010,10 @@ def update_database_registration(self, database_registration_id, update_database "databaseRegistrationId": database_registration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7023,7 +7022,7 @@ def update_database_registration(self, database_registration_id, update_database "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7111,7 +7110,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deployment got unknown kwargs: {extra_kwargs!r}") @@ -7120,10 +7119,10 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7132,7 +7131,7 @@ def update_deployment(self, deployment_id, update_deployment_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7220,7 +7219,7 @@ def update_deployment_backup(self, deployment_backup_id, update_deployment_backu "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -7229,10 +7228,10 @@ def update_deployment_backup(self, deployment_backup_id, update_deployment_backu "deploymentBackupId": deployment_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7241,7 +7240,7 @@ def update_deployment_backup(self, deployment_backup_id, update_deployment_backu "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7338,7 +7337,7 @@ def upgrade_deployment(self, deployment_id, upgrade_deployment_details, **kwargs "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_deployment got unknown kwargs: {extra_kwargs!r}") @@ -7347,10 +7346,10 @@ def upgrade_deployment(self, deployment_id, upgrade_deployment_details, **kwargs "deploymentId": deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7360,7 +7359,7 @@ def upgrade_deployment(self, deployment_id, upgrade_deployment_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7456,7 +7455,7 @@ def upgrade_deployment_upgrade(self, deployment_upgrade_id, upgrade_deployment_u "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -7465,10 +7464,10 @@ def upgrade_deployment_upgrade(self, deployment_upgrade_id, upgrade_deployment_u "deploymentUpgradeId": deployment_upgrade_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7478,7 +7477,7 @@ def upgrade_deployment_upgrade(self, deployment_upgrade_id, upgrade_deployment_u "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/governance_rules_control_plane/governance_rule_client.py b/src/oci/governance_rules_control_plane/governance_rule_client.py index 4168537058..843ea02cd4 100644 --- a/src/oci/governance_rules_control_plane/governance_rule_client.py +++ b/src/oci/governance_rules_control_plane/governance_rule_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_governance_rule(self, create_governance_rule_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_governance_rule(self, create_governance_rule_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def create_inclusion_criterion(self, create_inclusion_criterion_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_inclusion_criterion got unknown kwargs: {extra_kwargs!r}") @@ -273,7 +272,7 @@ def create_inclusion_criterion(self, create_inclusion_criterion_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -358,7 +357,7 @@ def delete_governance_rule(self, governance_rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -367,10 +366,10 @@ def delete_governance_rule(self, governance_rule_id, **kwargs): "governanceRuleId": governance_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -379,7 +378,7 @@ def delete_governance_rule(self, governance_rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -461,7 +460,7 @@ def delete_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_inclusion_criterion got unknown kwargs: {extra_kwargs!r}") @@ -470,10 +469,10 @@ def delete_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "inclusionCriterionId": inclusion_criterion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -482,7 +481,7 @@ def delete_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -556,7 +555,7 @@ def get_enforced_governance_rule(self, enforced_governance_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_enforced_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -565,10 +564,10 @@ def get_enforced_governance_rule(self, enforced_governance_rule_id, **kwargs): "enforcedGovernanceRuleId": enforced_governance_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -576,7 +575,7 @@ def get_enforced_governance_rule(self, enforced_governance_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -652,7 +651,7 @@ def get_governance_rule(self, governance_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -661,10 +660,10 @@ def get_governance_rule(self, governance_rule_id, **kwargs): "governanceRuleId": governance_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -672,7 +671,7 @@ def get_governance_rule(self, governance_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -748,7 +747,7 @@ def get_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_inclusion_criterion got unknown kwargs: {extra_kwargs!r}") @@ -757,10 +756,10 @@ def get_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "inclusionCriterionId": inclusion_criterion_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -768,7 +767,7 @@ def get_inclusion_criterion(self, inclusion_criterion_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -844,7 +843,7 @@ def get_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tenancy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -853,10 +852,10 @@ def get_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "tenancyAttachmentId": tenancy_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -864,7 +863,7 @@ def get_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -976,7 +975,7 @@ def list_enforced_governance_rules(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_enforced_governance_rules got unknown kwargs: {extra_kwargs!r}") @@ -1012,14 +1011,14 @@ def list_enforced_governance_rules(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1137,7 +1136,7 @@ def list_governance_rules(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_governance_rules got unknown kwargs: {extra_kwargs!r}") @@ -1181,14 +1180,14 @@ def list_governance_rules(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1295,7 +1294,7 @@ def list_inclusion_criteria(self, governance_rule_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_inclusion_criteria got unknown kwargs: {extra_kwargs!r}") @@ -1330,14 +1329,14 @@ def list_inclusion_criteria(self, governance_rule_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1453,7 +1452,7 @@ def list_tenancy_attachments(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tenancy_attachments got unknown kwargs: {extra_kwargs!r}") @@ -1490,14 +1489,14 @@ def list_tenancy_attachments(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1591,7 +1590,7 @@ def retry_governance_rule(self, governance_rule_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retry_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -1600,10 +1599,10 @@ def retry_governance_rule(self, governance_rule_id, **kwargs): "governanceRuleId": governance_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1613,7 +1612,7 @@ def retry_governance_rule(self, governance_rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1705,7 +1704,7 @@ def retry_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retry_tenancy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1714,10 +1713,10 @@ def retry_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "tenancyAttachmentId": tenancy_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1727,7 +1726,7 @@ def retry_tenancy_attachment(self, tenancy_attachment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1813,7 +1812,7 @@ def update_governance_rule(self, governance_rule_id, update_governance_rule_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_governance_rule got unknown kwargs: {extra_kwargs!r}") @@ -1822,10 +1821,10 @@ def update_governance_rule(self, governance_rule_id, update_governance_rule_deta "governanceRuleId": governance_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1834,7 +1833,7 @@ def update_governance_rule(self, governance_rule_id, update_governance_rule_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/governance_rules_control_plane/work_request_client.py b/src/oci/governance_rules_control_plane/work_request_client.py index 7aeb7f71f8..cc5e1d8cf4 100644 --- a/src/oci/governance_rules_control_plane/work_request_client.py +++ b/src/oci/governance_rules_control_plane/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -261,7 +260,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -270,10 +269,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -281,7 +280,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -377,7 +376,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -386,10 +385,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -412,14 +411,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -517,7 +516,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -526,10 +525,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -552,14 +551,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -672,7 +671,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -708,14 +707,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/healthchecks/health_checks_client.py b/src/oci/healthchecks/health_checks_client.py index 123f56cb5e..1e24d64eb5 100644 --- a/src/oci/healthchecks/health_checks_client.py +++ b/src/oci/healthchecks/health_checks_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def change_http_monitor_compartment(self, monitor_id, change_http_monitor_compar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_http_monitor_compartment got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def change_http_monitor_compartment(self, monitor_id, change_http_monitor_compar "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def change_http_monitor_compartment(self, monitor_id, change_http_monitor_compar "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -301,7 +300,7 @@ def change_ping_monitor_compartment(self, monitor_id, change_ping_monitor_compar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ping_monitor_compartment got unknown kwargs: {extra_kwargs!r}") @@ -310,10 +309,10 @@ def change_ping_monitor_compartment(self, monitor_id, change_ping_monitor_compar "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -323,7 +322,7 @@ def change_ping_monitor_compartment(self, monitor_id, change_ping_monitor_compar "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -412,7 +411,7 @@ def create_http_monitor(self, create_http_monitor_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_http_monitor got unknown kwargs: {extra_kwargs!r}") @@ -423,7 +422,7 @@ def create_http_monitor(self, create_http_monitor_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -504,7 +503,7 @@ def create_on_demand_http_probe(self, create_on_demand_http_probe_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_on_demand_http_probe got unknown kwargs: {extra_kwargs!r}") @@ -514,7 +513,7 @@ def create_on_demand_http_probe(self, create_on_demand_http_probe_details, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -594,7 +593,7 @@ def create_on_demand_ping_probe(self, create_on_demand_ping_probe_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_on_demand_ping_probe got unknown kwargs: {extra_kwargs!r}") @@ -604,7 +603,7 @@ def create_on_demand_ping_probe(self, create_on_demand_ping_probe_details, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -692,7 +691,7 @@ def create_ping_monitor(self, create_ping_monitor_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ping_monitor got unknown kwargs: {extra_kwargs!r}") @@ -703,7 +702,7 @@ def create_ping_monitor(self, create_ping_monitor_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -789,7 +788,7 @@ def delete_http_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_http_monitor got unknown kwargs: {extra_kwargs!r}") @@ -798,10 +797,10 @@ def delete_http_monitor(self, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -810,7 +809,7 @@ def delete_http_monitor(self, monitor_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -893,7 +892,7 @@ def delete_ping_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ping_monitor got unknown kwargs: {extra_kwargs!r}") @@ -902,10 +901,10 @@ def delete_ping_monitor(self, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -914,7 +913,7 @@ def delete_ping_monitor(self, monitor_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -996,7 +995,7 @@ def get_http_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_http_monitor got unknown kwargs: {extra_kwargs!r}") @@ -1005,10 +1004,10 @@ def get_http_monitor(self, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1017,7 +1016,7 @@ def get_http_monitor(self, monitor_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1101,7 +1100,7 @@ def get_ping_monitor(self, monitor_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ping_monitor got unknown kwargs: {extra_kwargs!r}") @@ -1110,10 +1109,10 @@ def get_ping_monitor(self, monitor_id, **kwargs): "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1122,7 +1121,7 @@ def get_ping_monitor(self, monitor_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1225,7 +1224,7 @@ def list_health_checks_vantage_points(self, **kwargs): "name", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_health_checks_vantage_points got unknown kwargs: {extra_kwargs!r}") @@ -1252,14 +1251,14 @@ def list_health_checks_vantage_points(self, **kwargs): "name": kwargs.get("name", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1365,7 +1364,7 @@ def list_http_monitors(self, compartment_id, **kwargs): "display_name", "home_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_http_monitors got unknown kwargs: {extra_kwargs!r}") @@ -1393,14 +1392,14 @@ def list_http_monitors(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "homeRegion": kwargs.get("home_region", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1506,7 +1505,7 @@ def list_http_probe_results(self, probe_configuration_id, **kwargs): "sort_order", "target" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_http_probe_results got unknown kwargs: {extra_kwargs!r}") @@ -1515,10 +1514,10 @@ def list_http_probe_results(self, probe_configuration_id, **kwargs): "probeConfigurationId": probe_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1536,14 +1535,14 @@ def list_http_probe_results(self, probe_configuration_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "target": kwargs.get("target", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1654,7 +1653,7 @@ def list_ping_monitors(self, compartment_id, **kwargs): "display_name", "home_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ping_monitors got unknown kwargs: {extra_kwargs!r}") @@ -1682,14 +1681,14 @@ def list_ping_monitors(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "homeRegion": kwargs.get("home_region", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1799,7 +1798,7 @@ def list_ping_probe_results(self, probe_configuration_id, **kwargs): "sort_order", "target" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ping_probe_results got unknown kwargs: {extra_kwargs!r}") @@ -1808,10 +1807,10 @@ def list_ping_probe_results(self, probe_configuration_id, **kwargs): "probeConfigurationId": probe_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1829,14 +1828,14 @@ def list_ping_probe_results(self, probe_configuration_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "target": kwargs.get("target", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1927,7 +1926,7 @@ def update_http_monitor(self, monitor_id, update_http_monitor_details, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_http_monitor got unknown kwargs: {extra_kwargs!r}") @@ -1936,10 +1935,10 @@ def update_http_monitor(self, monitor_id, update_http_monitor_details, **kwargs) "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1948,7 +1947,7 @@ def update_http_monitor(self, monitor_id, update_http_monitor_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2039,7 +2038,7 @@ def update_ping_monitor(self, monitor_id, update_ping_monitor_details, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ping_monitor got unknown kwargs: {extra_kwargs!r}") @@ -2048,10 +2047,10 @@ def update_ping_monitor(self, monitor_id, update_ping_monitor_details, **kwargs) "monitorId": monitor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2060,7 +2059,7 @@ def update_ping_monitor(self, monitor_id, update_ping_monitor_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/identity/identity_client.py b/src/oci/identity/identity_client.py index 573445b8de..7928c24cb3 100644 --- a/src/oci/identity/identity_client.py +++ b/src/oci/identity/identity_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def activate_domain(self, domain_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_domain got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def activate_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def activate_domain(self, domain_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -294,7 +293,7 @@ def activate_mfa_totp_device(self, user_id, mfa_totp_device_id, mfa_totp_token, "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_mfa_totp_device got unknown kwargs: {extra_kwargs!r}") @@ -304,10 +303,10 @@ def activate_mfa_totp_device(self, user_id, mfa_totp_device_id, mfa_totp_token, "mfaTotpDeviceId": mfa_totp_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -316,7 +315,7 @@ def activate_mfa_totp_device(self, user_id, mfa_totp_device_id, mfa_totp_token, "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -415,7 +414,7 @@ def add_tag_default_lock(self, tag_default_id, add_lock_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_tag_default_lock got unknown kwargs: {extra_kwargs!r}") @@ -424,10 +423,10 @@ def add_tag_default_lock(self, tag_default_id, add_lock_details, **kwargs): "tagDefaultId": tag_default_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -437,7 +436,7 @@ def add_tag_default_lock(self, tag_default_id, add_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -536,7 +535,7 @@ def add_tag_namespace_lock(self, tag_namespace_id, add_lock_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_tag_namespace_lock got unknown kwargs: {extra_kwargs!r}") @@ -545,10 +544,10 @@ def add_tag_namespace_lock(self, tag_namespace_id, add_lock_details, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -558,7 +557,7 @@ def add_tag_namespace_lock(self, tag_namespace_id, add_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -646,7 +645,7 @@ def add_user_to_group(self, add_user_to_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_user_to_group got unknown kwargs: {extra_kwargs!r}") @@ -656,7 +655,7 @@ def add_user_to_group(self, add_user_to_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -740,7 +739,7 @@ def assemble_effective_tag_set(self, compartment_id, **kwargs): "retry_strategy", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"assemble_effective_tag_set got unknown kwargs: {extra_kwargs!r}") @@ -756,7 +755,7 @@ def assemble_effective_tag_set(self, compartment_id, **kwargs): "compartmentId": compartment_id, "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -857,7 +856,7 @@ def bulk_delete_resources(self, compartment_id, bulk_delete_resources_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_delete_resources got unknown kwargs: {extra_kwargs!r}") @@ -866,10 +865,10 @@ def bulk_delete_resources(self, compartment_id, bulk_delete_resources_details, * "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -878,7 +877,7 @@ def bulk_delete_resources(self, compartment_id, bulk_delete_resources_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -990,7 +989,7 @@ def bulk_delete_tags(self, bulk_delete_tags_details, **kwargs): "opc_retry_token", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_delete_tags got unknown kwargs: {extra_kwargs!r}") @@ -998,7 +997,7 @@ def bulk_delete_tags(self, bulk_delete_tags_details, **kwargs): query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1006,7 +1005,7 @@ def bulk_delete_tags(self, bulk_delete_tags_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1108,7 +1107,7 @@ def bulk_edit_tags(self, **kwargs): "opc_retry_token", "bulk_edit_tags_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_edit_tags got unknown kwargs: {extra_kwargs!r}") @@ -1119,7 +1118,7 @@ def bulk_edit_tags(self, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1214,7 +1213,7 @@ def bulk_move_resources(self, compartment_id, bulk_move_resources_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_move_resources got unknown kwargs: {extra_kwargs!r}") @@ -1223,10 +1222,10 @@ def bulk_move_resources(self, compartment_id, bulk_move_resources_details, **kwa "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1235,7 +1234,7 @@ def bulk_move_resources(self, compartment_id, bulk_move_resources_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1351,7 +1350,7 @@ def cascade_delete_tag_namespace(self, tag_namespace_id, **kwargs): "opc_retry_token", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cascade_delete_tag_namespace got unknown kwargs: {extra_kwargs!r}") @@ -1360,16 +1359,16 @@ def cascade_delete_tag_namespace(self, tag_namespace_id, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1378,7 +1377,7 @@ def cascade_delete_tag_namespace(self, tag_namespace_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1478,7 +1477,7 @@ def change_domain_compartment(self, domain_id, change_domain_compartment_details "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1487,10 +1486,10 @@ def change_domain_compartment(self, domain_id, change_domain_compartment_details "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1500,7 +1499,7 @@ def change_domain_compartment(self, domain_id, change_domain_compartment_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1605,7 +1604,7 @@ def change_domain_license_type(self, domain_id, change_domain_license_type_detai "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_domain_license_type got unknown kwargs: {extra_kwargs!r}") @@ -1614,10 +1613,10 @@ def change_domain_license_type(self, domain_id, change_domain_license_type_detai "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1627,7 +1626,7 @@ def change_domain_license_type(self, domain_id, change_domain_license_type_detai "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1724,7 +1723,7 @@ def change_tag_namespace_compartment(self, tag_namespace_id, change_tag_namespac "opc_retry_token", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_tag_namespace_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1733,23 +1732,23 @@ def change_tag_namespace_compartment(self, tag_namespace_id, change_tag_namespac "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1848,7 +1847,7 @@ def create_auth_token(self, create_auth_token_details, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -1857,10 +1856,10 @@ def create_auth_token(self, create_auth_token_details, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1868,7 +1867,7 @@ def create_auth_token(self, create_auth_token_details, user_id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1972,7 +1971,7 @@ def create_compartment(self, create_compartment_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1982,7 +1981,7 @@ def create_compartment(self, create_compartment_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2080,7 +2079,7 @@ def create_customer_secret_key(self, create_customer_secret_key_details, user_id "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -2089,10 +2088,10 @@ def create_customer_secret_key(self, create_customer_secret_key_details, user_id "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2100,7 +2099,7 @@ def create_customer_secret_key(self, create_customer_secret_key_details, user_id "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2193,7 +2192,7 @@ def create_db_credential(self, create_db_credential_details, user_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -2202,10 +2201,10 @@ def create_db_credential(self, create_db_credential_details, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2214,7 +2213,7 @@ def create_db_credential(self, create_db_credential_details, user_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2311,7 +2310,7 @@ def create_domain(self, create_domain_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_domain got unknown kwargs: {extra_kwargs!r}") @@ -2322,7 +2321,7 @@ def create_domain(self, create_domain_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2423,7 +2422,7 @@ def create_dynamic_group(self, create_dynamic_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dynamic_group got unknown kwargs: {extra_kwargs!r}") @@ -2433,7 +2432,7 @@ def create_dynamic_group(self, create_dynamic_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2539,7 +2538,7 @@ def create_group(self, create_group_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_group got unknown kwargs: {extra_kwargs!r}") @@ -2549,7 +2548,7 @@ def create_group(self, create_group_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2655,7 +2654,7 @@ def create_identity_provider(self, create_identity_provider_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -2665,7 +2664,7 @@ def create_identity_provider(self, create_identity_provider_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2756,7 +2755,7 @@ def create_idp_group_mapping(self, create_idp_group_mapping_details, identity_pr "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_idp_group_mapping got unknown kwargs: {extra_kwargs!r}") @@ -2765,10 +2764,10 @@ def create_idp_group_mapping(self, create_idp_group_mapping_details, identity_pr "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2776,7 +2775,7 @@ def create_idp_group_mapping(self, create_idp_group_mapping_details, identity_pr "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2861,7 +2860,7 @@ def create_mfa_totp_device(self, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_mfa_totp_device got unknown kwargs: {extra_kwargs!r}") @@ -2870,10 +2869,10 @@ def create_mfa_totp_device(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2881,7 +2880,7 @@ def create_mfa_totp_device(self, user_id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2988,7 +2987,7 @@ def create_network_source(self, create_network_source_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_source got unknown kwargs: {extra_kwargs!r}") @@ -2998,7 +2997,7 @@ def create_network_source(self, create_network_source_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3084,7 +3083,7 @@ def create_o_auth_client_credential(self, user_id, create_o_auth2_client_credent "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_o_auth_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -3093,10 +3092,10 @@ def create_o_auth_client_credential(self, user_id, create_o_auth2_client_credent "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3104,7 +3103,7 @@ def create_o_auth_client_credential(self, user_id, create_o_auth2_client_credent "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3205,7 +3204,7 @@ def create_or_reset_ui_password(self, user_id, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_or_reset_ui_password got unknown kwargs: {extra_kwargs!r}") @@ -3214,10 +3213,10 @@ def create_or_reset_ui_password(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3225,7 +3224,7 @@ def create_or_reset_ui_password(self, user_id, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3328,7 +3327,7 @@ def create_policy(self, create_policy_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_policy got unknown kwargs: {extra_kwargs!r}") @@ -3338,7 +3337,7 @@ def create_policy(self, create_policy_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3424,7 +3423,7 @@ def create_region_subscription(self, create_region_subscription_details, tenancy "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_region_subscription got unknown kwargs: {extra_kwargs!r}") @@ -3433,10 +3432,10 @@ def create_region_subscription(self, create_region_subscription_details, tenancy "tenancyId": tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3444,7 +3443,7 @@ def create_region_subscription(self, create_region_subscription_details, tenancy "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3535,7 +3534,7 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -3544,10 +3543,10 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3555,7 +3554,7 @@ def create_smtp_credential(self, create_smtp_credential_details, user_id, **kwar "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3656,7 +3655,7 @@ def create_swift_password(self, create_swift_password_details, user_id, **kwargs "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_swift_password got unknown kwargs: {extra_kwargs!r}") @@ -3665,10 +3664,10 @@ def create_swift_password(self, create_swift_password_details, user_id, **kwargs "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3676,7 +3675,7 @@ def create_swift_password(self, create_swift_password_details, user_id, **kwargs "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3789,7 +3788,7 @@ def create_tag(self, tag_namespace_id, create_tag_details, **kwargs): "opc_retry_token", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tag got unknown kwargs: {extra_kwargs!r}") @@ -3798,23 +3797,23 @@ def create_tag(self, tag_namespace_id, create_tag_details, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3913,7 +3912,7 @@ def create_tag_default(self, create_tag_default_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tag_default got unknown kwargs: {extra_kwargs!r}") @@ -3924,7 +3923,7 @@ def create_tag_default(self, create_tag_default_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4020,7 +4019,7 @@ def create_tag_namespace(self, create_tag_namespace_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tag_namespace got unknown kwargs: {extra_kwargs!r}") @@ -4030,7 +4029,7 @@ def create_tag_namespace(self, create_tag_namespace_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4151,7 +4150,7 @@ def create_user(self, create_user_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user got unknown kwargs: {extra_kwargs!r}") @@ -4161,7 +4160,7 @@ def create_user(self, create_user_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4263,7 +4262,7 @@ def deactivate_domain(self, domain_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_domain got unknown kwargs: {extra_kwargs!r}") @@ -4272,10 +4271,10 @@ def deactivate_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4285,7 +4284,7 @@ def deactivate_domain(self, domain_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4372,7 +4371,7 @@ def delete_api_key(self, user_id, fingerprint, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_api_key got unknown kwargs: {extra_kwargs!r}") @@ -4382,10 +4381,10 @@ def delete_api_key(self, user_id, fingerprint, **kwargs): "fingerprint": fingerprint } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4393,7 +4392,7 @@ def delete_api_key(self, user_id, fingerprint, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4474,7 +4473,7 @@ def delete_auth_token(self, user_id, auth_token_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -4484,10 +4483,10 @@ def delete_auth_token(self, user_id, auth_token_id, **kwargs): "authTokenId": auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4495,7 +4494,7 @@ def delete_auth_token(self, user_id, auth_token_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4573,7 +4572,7 @@ def delete_compartment(self, compartment_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_compartment got unknown kwargs: {extra_kwargs!r}") @@ -4582,10 +4581,10 @@ def delete_compartment(self, compartment_id, **kwargs): "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4593,7 +4592,7 @@ def delete_compartment(self, compartment_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4674,7 +4673,7 @@ def delete_customer_secret_key(self, user_id, customer_secret_key_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -4684,10 +4683,10 @@ def delete_customer_secret_key(self, user_id, customer_secret_key_id, **kwargs): "customerSecretKeyId": customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4695,7 +4694,7 @@ def delete_customer_secret_key(self, user_id, customer_secret_key_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4781,7 +4780,7 @@ def delete_db_credential(self, user_id, db_credential_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -4791,10 +4790,10 @@ def delete_db_credential(self, user_id, db_credential_id, **kwargs): "dbCredentialId": db_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4803,7 +4802,7 @@ def delete_db_credential(self, user_id, db_credential_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4892,7 +4891,7 @@ def delete_domain(self, domain_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_domain got unknown kwargs: {extra_kwargs!r}") @@ -4901,10 +4900,10 @@ def delete_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4913,7 +4912,7 @@ def delete_domain(self, domain_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4991,7 +4990,7 @@ def delete_dynamic_group(self, dynamic_group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dynamic_group got unknown kwargs: {extra_kwargs!r}") @@ -5000,10 +4999,10 @@ def delete_dynamic_group(self, dynamic_group_id, **kwargs): "dynamicGroupId": dynamic_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5011,7 +5010,7 @@ def delete_dynamic_group(self, dynamic_group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5089,7 +5088,7 @@ def delete_group(self, group_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_group got unknown kwargs: {extra_kwargs!r}") @@ -5098,10 +5097,10 @@ def delete_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5109,7 +5108,7 @@ def delete_group(self, group_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5192,7 +5191,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -5201,10 +5200,10 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5212,7 +5211,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5297,7 +5296,7 @@ def delete_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_idp_group_mapping got unknown kwargs: {extra_kwargs!r}") @@ -5307,10 +5306,10 @@ def delete_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "mappingId": mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5318,7 +5317,7 @@ def delete_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5399,7 +5398,7 @@ def delete_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_mfa_totp_device got unknown kwargs: {extra_kwargs!r}") @@ -5409,10 +5408,10 @@ def delete_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): "mfaTotpDeviceId": mfa_totp_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5420,7 +5419,7 @@ def delete_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5498,7 +5497,7 @@ def delete_network_source(self, network_source_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_source got unknown kwargs: {extra_kwargs!r}") @@ -5507,10 +5506,10 @@ def delete_network_source(self, network_source_id, **kwargs): "networkSourceId": network_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5518,7 +5517,7 @@ def delete_network_source(self, network_source_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5599,7 +5598,7 @@ def delete_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_o_auth_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -5609,10 +5608,10 @@ def delete_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "oauth2ClientCredentialId": oauth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5620,7 +5619,7 @@ def delete_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5698,7 +5697,7 @@ def delete_policy(self, policy_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_policy got unknown kwargs: {extra_kwargs!r}") @@ -5707,10 +5706,10 @@ def delete_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5718,7 +5717,7 @@ def delete_policy(self, policy_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5799,7 +5798,7 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -5809,10 +5808,10 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): "smtpCredentialId": smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5820,7 +5819,7 @@ def delete_smtp_credential(self, user_id, smtp_credential_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5903,7 +5902,7 @@ def delete_swift_password(self, user_id, swift_password_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_swift_password got unknown kwargs: {extra_kwargs!r}") @@ -5913,10 +5912,10 @@ def delete_swift_password(self, user_id, swift_password_id, **kwargs): "swiftPasswordId": swift_password_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5924,7 +5923,7 @@ def delete_swift_password(self, user_id, swift_password_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6028,7 +6027,7 @@ def delete_tag(self, tag_namespace_id, tag_name, **kwargs): "if_match", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tag got unknown kwargs: {extra_kwargs!r}") @@ -6038,23 +6037,23 @@ def delete_tag(self, tag_namespace_id, tag_name, **kwargs): "tagName": tag_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6143,7 +6142,7 @@ def delete_tag_default(self, tag_default_id, **kwargs): "if_match", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tag_default got unknown kwargs: {extra_kwargs!r}") @@ -6152,16 +6151,16 @@ def delete_tag_default(self, tag_default_id, **kwargs): "tagDefaultId": tag_default_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6169,7 +6168,7 @@ def delete_tag_default(self, tag_default_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6264,7 +6263,7 @@ def delete_tag_namespace(self, tag_namespace_id, **kwargs): "opc_request_id", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tag_namespace got unknown kwargs: {extra_kwargs!r}") @@ -6273,16 +6272,16 @@ def delete_tag_namespace(self, tag_namespace_id, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6290,7 +6289,7 @@ def delete_tag_namespace(self, tag_namespace_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6370,7 +6369,7 @@ def delete_user(self, user_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user got unknown kwargs: {extra_kwargs!r}") @@ -6379,10 +6378,10 @@ def delete_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6390,7 +6389,7 @@ def delete_user(self, user_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6493,7 +6492,7 @@ def enable_replication_to_region(self, domain_id, enable_replication_to_region_d "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_replication_to_region got unknown kwargs: {extra_kwargs!r}") @@ -6502,10 +6501,10 @@ def enable_replication_to_region(self, domain_id, enable_replication_to_region_d "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6515,7 +6514,7 @@ def enable_replication_to_region(self, domain_id, enable_replication_to_region_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6599,7 +6598,7 @@ def generate_totp_seed(self, user_id, mfa_totp_device_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_totp_seed got unknown kwargs: {extra_kwargs!r}") @@ -6609,10 +6608,10 @@ def generate_totp_seed(self, user_id, mfa_totp_device_id, **kwargs): "mfaTotpDeviceId": mfa_totp_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6620,7 +6619,7 @@ def generate_totp_seed(self, user_id, mfa_totp_device_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6691,7 +6690,7 @@ def get_authentication_policy(self, compartment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/AuthenticationPolicy/GetAuthenticationPolicy" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_authentication_policy got unknown kwargs: {extra_kwargs!r}") @@ -6700,10 +6699,10 @@ def get_authentication_policy(self, compartment_id, **kwargs): "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6786,7 +6785,7 @@ def get_compartment(self, compartment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Compartment/GetCompartment" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_compartment got unknown kwargs: {extra_kwargs!r}") @@ -6795,10 +6794,10 @@ def get_compartment(self, compartment_id, **kwargs): "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6883,7 +6882,7 @@ def get_domain(self, domain_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_domain got unknown kwargs: {extra_kwargs!r}") @@ -6892,10 +6891,10 @@ def get_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6903,7 +6902,7 @@ def get_domain(self, domain_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6973,7 +6972,7 @@ def get_dynamic_group(self, dynamic_group_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/DynamicGroup/GetDynamicGroup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dynamic_group got unknown kwargs: {extra_kwargs!r}") @@ -6982,10 +6981,10 @@ def get_dynamic_group(self, dynamic_group_id, **kwargs): "dynamicGroupId": dynamic_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7065,7 +7064,7 @@ def get_group(self, group_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Group/GetGroup" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_group got unknown kwargs: {extra_kwargs!r}") @@ -7074,10 +7073,10 @@ def get_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7162,7 +7161,7 @@ def get_iam_work_request(self, iam_work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_iam_work_request got unknown kwargs: {extra_kwargs!r}") @@ -7171,10 +7170,10 @@ def get_iam_work_request(self, iam_work_request_id, **kwargs): "iamWorkRequestId": iam_work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7182,7 +7181,7 @@ def get_iam_work_request(self, iam_work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7256,7 +7255,7 @@ def get_identity_provider(self, identity_provider_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/IdentityProvider/GetIdentityProvider" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -7265,10 +7264,10 @@ def get_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7351,7 +7350,7 @@ def get_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/IdpGroupMapping/GetIdpGroupMapping" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_idp_group_mapping got unknown kwargs: {extra_kwargs!r}") @@ -7361,10 +7360,10 @@ def get_idp_group_mapping(self, identity_provider_id, mapping_id, **kwargs): "mappingId": mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7443,7 +7442,7 @@ def get_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/MfaTotpDeviceSummary/GetMfaTotpDevice" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mfa_totp_device got unknown kwargs: {extra_kwargs!r}") @@ -7453,10 +7452,10 @@ def get_mfa_totp_device(self, user_id, mfa_totp_device_id, **kwargs): "mfaTotpDeviceId": mfa_totp_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7532,7 +7531,7 @@ def get_network_source(self, network_source_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/NetworkSources/GetNetworkSource" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_source got unknown kwargs: {extra_kwargs!r}") @@ -7541,10 +7540,10 @@ def get_network_source(self, network_source_id, **kwargs): "networkSourceId": network_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7620,7 +7619,7 @@ def get_policy(self, policy_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Policy/GetPolicy" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_policy got unknown kwargs: {extra_kwargs!r}") @@ -7629,10 +7628,10 @@ def get_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7711,7 +7710,7 @@ def get_standard_tag_template(self, compartment_id, standard_tag_namespace_name, api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/StandardTagNamespaceTemplate/GetStandardTagTemplate" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_standard_tag_template got unknown kwargs: {extra_kwargs!r}") @@ -7720,16 +7719,16 @@ def get_standard_tag_template(self, compartment_id, standard_tag_namespace_name, "standardTagNamespaceName": standard_tag_namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7809,7 +7808,7 @@ def get_tag(self, tag_namespace_id, tag_name, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Tag/GetTag" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tag got unknown kwargs: {extra_kwargs!r}") @@ -7819,10 +7818,10 @@ def get_tag(self, tag_namespace_id, tag_name, **kwargs): "tagName": tag_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7898,7 +7897,7 @@ def get_tag_default(self, tag_default_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/TagDefault/GetTagDefault" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tag_default got unknown kwargs: {extra_kwargs!r}") @@ -7907,10 +7906,10 @@ def get_tag_default(self, tag_default_id, **kwargs): "tagDefaultId": tag_default_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7986,7 +7985,7 @@ def get_tag_namespace(self, tag_namespace_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/TagNamespace/GetTagNamespace" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tag_namespace got unknown kwargs: {extra_kwargs!r}") @@ -7995,10 +7994,10 @@ def get_tag_namespace(self, tag_namespace_id, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8075,7 +8074,7 @@ def get_tagging_work_request(self, work_request_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/TaggingWorkRequest/GetTaggingWorkRequest" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tagging_work_request got unknown kwargs: {extra_kwargs!r}") @@ -8084,10 +8083,10 @@ def get_tagging_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8163,7 +8162,7 @@ def get_tenancy(self, tenancy_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Tenancy/GetTenancy" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tenancy got unknown kwargs: {extra_kwargs!r}") @@ -8172,10 +8171,10 @@ def get_tenancy(self, tenancy_id, **kwargs): "tenancyId": tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8251,7 +8250,7 @@ def get_user(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/User/GetUser" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user got unknown kwargs: {extra_kwargs!r}") @@ -8260,10 +8259,10 @@ def get_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8339,7 +8338,7 @@ def get_user_group_membership(self, user_group_membership_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/UserGroupMembership/GetUserGroupMembership" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_group_membership got unknown kwargs: {extra_kwargs!r}") @@ -8348,10 +8347,10 @@ def get_user_group_membership(self, user_group_membership_id, **kwargs): "userGroupMembershipId": user_group_membership_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8428,7 +8427,7 @@ def get_user_ui_password_information(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/UIPasswordInformation/GetUserUiPasswordInformation" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_ui_password_information got unknown kwargs: {extra_kwargs!r}") @@ -8437,10 +8436,10 @@ def get_user_ui_password_information(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8517,7 +8516,7 @@ def get_work_request(self, work_request_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/WorkRequest/GetWorkRequest" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -8526,10 +8525,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8624,7 +8623,7 @@ def import_standard_tags(self, **kwargs): "opc_retry_token", "import_standard_tags_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_standard_tags got unknown kwargs: {extra_kwargs!r}") @@ -8635,7 +8634,7 @@ def import_standard_tags(self, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8718,7 +8717,7 @@ def list_allowed_domain_license_types(self, **kwargs): "current_license_type_name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_allowed_domain_license_types got unknown kwargs: {extra_kwargs!r}") @@ -8726,14 +8725,14 @@ def list_allowed_domain_license_types(self, **kwargs): query_params = { "currentLicenseTypeName": kwargs.get("current_license_type_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8806,7 +8805,7 @@ def list_api_keys(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/ApiKey/ListApiKeys" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_api_keys got unknown kwargs: {extra_kwargs!r}") @@ -8815,10 +8814,10 @@ def list_api_keys(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8895,7 +8894,7 @@ def list_auth_tokens(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/AuthToken/ListAuthTokens" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auth_tokens got unknown kwargs: {extra_kwargs!r}") @@ -8904,10 +8903,10 @@ def list_auth_tokens(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8989,7 +8988,7 @@ def list_availability_domains(self, compartment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/AvailabilityDomain/ListAvailabilityDomains" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_availability_domains got unknown kwargs: {extra_kwargs!r}") @@ -8997,7 +8996,7 @@ def list_availability_domains(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9094,7 +9093,7 @@ def list_bulk_action_resource_types(self, bulk_action_type, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bulk_action_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -9110,7 +9109,7 @@ def list_bulk_action_resource_types(self, bulk_action_type, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9194,7 +9193,7 @@ def list_bulk_edit_tags_resource_types(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_bulk_edit_tags_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -9203,7 +9202,7 @@ def list_bulk_edit_tags_resource_types(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9359,7 +9358,7 @@ def list_compartments(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_compartments got unknown kwargs: {extra_kwargs!r}") @@ -9403,7 +9402,7 @@ def list_compartments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9493,7 +9492,7 @@ def list_cost_tracking_tags(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cost_tracking_tags got unknown kwargs: {extra_kwargs!r}") @@ -9503,7 +9502,7 @@ def list_cost_tracking_tags(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -9579,7 +9578,7 @@ def list_customer_secret_keys(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/CustomerSecretKeySummary/ListCustomerSecretKeys" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_customer_secret_keys got unknown kwargs: {extra_kwargs!r}") @@ -9588,10 +9587,10 @@ def list_customer_secret_keys(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9714,7 +9713,7 @@ def list_db_credentials(self, user_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_credentials got unknown kwargs: {extra_kwargs!r}") @@ -9723,10 +9722,10 @@ def list_db_credentials(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -9758,14 +9757,14 @@ def list_db_credentials(self, user_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9908,7 +9907,7 @@ def list_domains(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_domains got unknown kwargs: {extra_kwargs!r}") @@ -9949,14 +9948,14 @@ def list_domains(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10072,7 +10071,7 @@ def list_dynamic_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dynamic_groups got unknown kwargs: {extra_kwargs!r}") @@ -10107,7 +10106,7 @@ def list_dynamic_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10189,7 +10188,7 @@ def list_fault_domains(self, compartment_id, availability_domain, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/FaultDomain/ListFaultDomains" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fault_domains got unknown kwargs: {extra_kwargs!r}") @@ -10198,7 +10197,7 @@ def list_fault_domains(self, compartment_id, availability_domain, **kwargs): "compartmentId": compartment_id, "availabilityDomain": availability_domain } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10319,7 +10318,7 @@ def list_groups(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_groups got unknown kwargs: {extra_kwargs!r}") @@ -10354,7 +10353,7 @@ def list_groups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10453,7 +10452,7 @@ def list_iam_work_request_errors(self, iam_work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_iam_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -10462,10 +10461,10 @@ def list_iam_work_request_errors(self, iam_work_request_id, **kwargs): "iamWorkRequestId": iam_work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10480,14 +10479,14 @@ def list_iam_work_request_errors(self, iam_work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10583,7 +10582,7 @@ def list_iam_work_request_logs(self, iam_work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_iam_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -10592,10 +10591,10 @@ def list_iam_work_request_logs(self, iam_work_request_id, **kwargs): "iamWorkRequestId": iam_work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10610,14 +10609,14 @@ def list_iam_work_request_logs(self, iam_work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10710,7 +10709,7 @@ def list_iam_work_requests(self, compartment_id, **kwargs): "resource_identifier", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_iam_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -10721,14 +10720,14 @@ def list_iam_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "resourceIdentifier": kwargs.get("resource_identifier", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10824,7 +10823,7 @@ def list_identity_provider_groups(self, identity_provider_id, **kwargs): "name", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_identity_provider_groups got unknown kwargs: {extra_kwargs!r}") @@ -10833,10 +10832,10 @@ def list_identity_provider_groups(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -10852,7 +10851,7 @@ def list_identity_provider_groups(self, identity_provider_id, **kwargs): "name": kwargs.get("name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10984,7 +10983,7 @@ def list_identity_providers(self, protocol, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_identity_providers got unknown kwargs: {extra_kwargs!r}") @@ -11020,7 +11019,7 @@ def list_identity_providers(self, protocol, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11111,7 +11110,7 @@ def list_idp_group_mappings(self, identity_provider_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_idp_group_mappings got unknown kwargs: {extra_kwargs!r}") @@ -11120,17 +11119,17 @@ def list_idp_group_mappings(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11240,7 +11239,7 @@ def list_mfa_totp_devices(self, user_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_mfa_totp_devices got unknown kwargs: {extra_kwargs!r}") @@ -11249,10 +11248,10 @@ def list_mfa_totp_devices(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -11275,7 +11274,7 @@ def list_mfa_totp_devices(self, user_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11398,7 +11397,7 @@ def list_network_sources(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_sources got unknown kwargs: {extra_kwargs!r}") @@ -11433,7 +11432,7 @@ def list_network_sources(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11526,7 +11525,7 @@ def list_o_auth_client_credentials(self, user_id, **kwargs): "limit", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_o_auth_client_credentials got unknown kwargs: {extra_kwargs!r}") @@ -11535,10 +11534,10 @@ def list_o_auth_client_credentials(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -11553,7 +11552,7 @@ def list_o_auth_client_credentials(self, user_id, **kwargs): "limit": kwargs.get("limit", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11678,7 +11677,7 @@ def list_policies(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_policies got unknown kwargs: {extra_kwargs!r}") @@ -11713,7 +11712,7 @@ def list_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11788,7 +11787,7 @@ def list_region_subscriptions(self, tenancy_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/RegionSubscription/ListRegionSubscriptions" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_region_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -11797,10 +11796,10 @@ def list_region_subscriptions(self, tenancy_id, **kwargs): "tenancyId": tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11873,7 +11872,7 @@ def list_regions(self, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/Region/ListRegions" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_regions got unknown kwargs: {extra_kwargs!r}") @@ -11950,7 +11949,7 @@ def list_smtp_credentials(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/SmtpCredentialSummary/ListSmtpCredentials" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_smtp_credentials got unknown kwargs: {extra_kwargs!r}") @@ -11959,10 +11958,10 @@ def list_smtp_credentials(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12050,7 +12049,7 @@ def list_standard_tag_namespaces(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_standard_tag_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -12060,7 +12059,7 @@ def list_standard_tag_namespaces(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12138,7 +12137,7 @@ def list_swift_passwords(self, user_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/SwiftPassword/ListSwiftPasswords" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_swift_passwords got unknown kwargs: {extra_kwargs!r}") @@ -12147,10 +12146,10 @@ def list_swift_passwords(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12253,7 +12252,7 @@ def list_tag_defaults(self, **kwargs): "tag_definition_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tag_defaults got unknown kwargs: {extra_kwargs!r}") @@ -12273,7 +12272,7 @@ def list_tag_defaults(self, **kwargs): "tagDefinitionId": kwargs.get("tag_definition_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12371,7 +12370,7 @@ def list_tag_namespaces(self, compartment_id, **kwargs): "include_subcompartments", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tag_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -12390,7 +12389,7 @@ def list_tag_namespaces(self, compartment_id, **kwargs): "includeSubcompartments": kwargs.get("include_subcompartments", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12477,7 +12476,7 @@ def list_tagging_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tagging_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -12486,17 +12485,17 @@ def list_tagging_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12585,7 +12584,7 @@ def list_tagging_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tagging_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -12594,17 +12593,17 @@ def list_tagging_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12697,7 +12696,7 @@ def list_tagging_work_requests(self, compartment_id, **kwargs): "limit", "resource_identifier" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tagging_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -12708,7 +12707,7 @@ def list_tagging_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "resourceIdentifier": kwargs.get("resource_identifier", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12801,7 +12800,7 @@ def list_tags(self, tag_namespace_id, **kwargs): "limit", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tags got unknown kwargs: {extra_kwargs!r}") @@ -12810,10 +12809,10 @@ def list_tags(self, tag_namespace_id, **kwargs): "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12828,7 +12827,7 @@ def list_tags(self, tag_namespace_id, **kwargs): "limit": kwargs.get("limit", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -12936,7 +12935,7 @@ def list_user_group_memberships(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_group_memberships got unknown kwargs: {extra_kwargs!r}") @@ -12948,7 +12947,7 @@ def list_user_group_memberships(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -13077,7 +13076,7 @@ def list_users(self, compartment_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_users got unknown kwargs: {extra_kwargs!r}") @@ -13114,7 +13113,7 @@ def list_users(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -13205,7 +13204,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "resource_identifier" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -13216,7 +13215,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "resourceIdentifier": kwargs.get("resource_identifier", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -13326,7 +13325,7 @@ def move_compartment(self, compartment_id, move_compartment_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"move_compartment got unknown kwargs: {extra_kwargs!r}") @@ -13335,10 +13334,10 @@ def move_compartment(self, compartment_id, move_compartment_details, **kwargs): "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13348,7 +13347,7 @@ def move_compartment(self, compartment_id, move_compartment_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13434,7 +13433,7 @@ def recover_compartment(self, compartment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"recover_compartment got unknown kwargs: {extra_kwargs!r}") @@ -13443,10 +13442,10 @@ def recover_compartment(self, compartment_id, **kwargs): "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13455,7 +13454,7 @@ def recover_compartment(self, compartment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13551,7 +13550,7 @@ def remove_tag_default_lock(self, tag_default_id, remove_lock_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_tag_default_lock got unknown kwargs: {extra_kwargs!r}") @@ -13560,10 +13559,10 @@ def remove_tag_default_lock(self, tag_default_id, remove_lock_details, **kwargs) "tagDefaultId": tag_default_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13573,7 +13572,7 @@ def remove_tag_default_lock(self, tag_default_id, remove_lock_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13672,7 +13671,7 @@ def remove_tag_namespace_lock(self, tag_namespace_id, remove_lock_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_tag_namespace_lock got unknown kwargs: {extra_kwargs!r}") @@ -13681,10 +13680,10 @@ def remove_tag_namespace_lock(self, tag_namespace_id, remove_lock_details, **kwa "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13694,7 +13693,7 @@ def remove_tag_namespace_lock(self, tag_namespace_id, remove_lock_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13777,7 +13776,7 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_user_from_group got unknown kwargs: {extra_kwargs!r}") @@ -13786,10 +13785,10 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): "userGroupMembershipId": user_group_membership_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13797,7 +13796,7 @@ def remove_user_from_group(self, user_group_membership_id, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13865,7 +13864,7 @@ def reset_idp_scim_client(self, identity_provider_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity/20160918/ScimClientCredentials/ResetIdpScimClient" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_idp_scim_client got unknown kwargs: {extra_kwargs!r}") @@ -13874,10 +13873,10 @@ def reset_idp_scim_client(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13969,7 +13968,7 @@ def update_auth_token(self, user_id, auth_token_id, update_auth_token_details, * "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -13979,10 +13978,10 @@ def update_auth_token(self, user_id, auth_token_id, update_auth_token_details, * "authTokenId": auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13990,7 +13989,7 @@ def update_auth_token(self, user_id, auth_token_id, update_auth_token_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14075,7 +14074,7 @@ def update_authentication_policy(self, compartment_id, update_authentication_pol "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_authentication_policy got unknown kwargs: {extra_kwargs!r}") @@ -14084,10 +14083,10 @@ def update_authentication_policy(self, compartment_id, update_authentication_pol "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14095,7 +14094,7 @@ def update_authentication_policy(self, compartment_id, update_authentication_pol "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14180,7 +14179,7 @@ def update_compartment(self, compartment_id, update_compartment_details, **kwarg "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compartment got unknown kwargs: {extra_kwargs!r}") @@ -14189,10 +14188,10 @@ def update_compartment(self, compartment_id, update_compartment_details, **kwarg "compartmentId": compartment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14200,7 +14199,7 @@ def update_compartment(self, compartment_id, update_compartment_details, **kwarg "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14288,7 +14287,7 @@ def update_customer_secret_key(self, user_id, customer_secret_key_id, update_cus "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -14298,10 +14297,10 @@ def update_customer_secret_key(self, user_id, customer_secret_key_id, update_cus "customerSecretKeyId": customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14309,7 +14308,7 @@ def update_customer_secret_key(self, user_id, customer_secret_key_id, update_cus "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14402,7 +14401,7 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_domain got unknown kwargs: {extra_kwargs!r}") @@ -14411,10 +14410,10 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14423,7 +14422,7 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14506,7 +14505,7 @@ def update_dynamic_group(self, dynamic_group_id, update_dynamic_group_details, * "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_dynamic_group got unknown kwargs: {extra_kwargs!r}") @@ -14515,10 +14514,10 @@ def update_dynamic_group(self, dynamic_group_id, update_dynamic_group_details, * "dynamicGroupId": dynamic_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14526,7 +14525,7 @@ def update_dynamic_group(self, dynamic_group_id, update_dynamic_group_details, * "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14611,7 +14610,7 @@ def update_group(self, group_id, update_group_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_group got unknown kwargs: {extra_kwargs!r}") @@ -14620,10 +14619,10 @@ def update_group(self, group_id, update_group_details, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14631,7 +14630,7 @@ def update_group(self, group_id, update_group_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14720,7 +14719,7 @@ def update_identity_provider(self, identity_provider_id, update_identity_provide "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -14729,10 +14728,10 @@ def update_identity_provider(self, identity_provider_id, update_identity_provide "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14740,7 +14739,7 @@ def update_identity_provider(self, identity_provider_id, update_identity_provide "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14832,7 +14831,7 @@ def update_idp_group_mapping(self, identity_provider_id, mapping_id, update_idp_ "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_idp_group_mapping got unknown kwargs: {extra_kwargs!r}") @@ -14842,10 +14841,10 @@ def update_idp_group_mapping(self, identity_provider_id, mapping_id, update_idp_ "mappingId": mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14853,7 +14852,7 @@ def update_idp_group_mapping(self, identity_provider_id, mapping_id, update_idp_ "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14938,7 +14937,7 @@ def update_network_source(self, network_source_id, update_network_source_details "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_source got unknown kwargs: {extra_kwargs!r}") @@ -14947,10 +14946,10 @@ def update_network_source(self, network_source_id, update_network_source_details "networkSourceId": network_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14958,7 +14957,7 @@ def update_network_source(self, network_source_id, update_network_source_details "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15046,7 +15045,7 @@ def update_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_o_auth_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -15056,10 +15055,10 @@ def update_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "oauth2ClientCredentialId": oauth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15067,7 +15066,7 @@ def update_o_auth_client_credential(self, user_id, oauth2_client_credential_id, "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15154,7 +15153,7 @@ def update_policy(self, policy_id, update_policy_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_policy got unknown kwargs: {extra_kwargs!r}") @@ -15163,10 +15162,10 @@ def update_policy(self, policy_id, update_policy_details, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15174,7 +15173,7 @@ def update_policy(self, policy_id, update_policy_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15262,7 +15261,7 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -15272,10 +15271,10 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden "smtpCredentialId": smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15283,7 +15282,7 @@ def update_smtp_credential(self, user_id, smtp_credential_id, update_smtp_creden "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15373,7 +15372,7 @@ def update_swift_password(self, user_id, swift_password_id, update_swift_passwor "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_swift_password got unknown kwargs: {extra_kwargs!r}") @@ -15383,10 +15382,10 @@ def update_swift_password(self, user_id, swift_password_id, update_swift_passwor "swiftPasswordId": swift_password_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15394,7 +15393,7 @@ def update_swift_password(self, user_id, swift_password_id, update_swift_passwor "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15495,7 +15494,7 @@ def update_tag(self, tag_namespace_id, tag_name, update_tag_details, **kwargs): "if_match", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tag got unknown kwargs: {extra_kwargs!r}") @@ -15505,23 +15504,23 @@ def update_tag(self, tag_namespace_id, tag_name, update_tag_details, **kwargs): "tagName": tag_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15622,7 +15621,7 @@ def update_tag_default(self, tag_default_id, update_tag_default_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tag_default got unknown kwargs: {extra_kwargs!r}") @@ -15631,16 +15630,16 @@ def update_tag_default(self, tag_default_id, update_tag_default_details, **kwarg "tagDefaultId": tag_default_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15648,7 +15647,7 @@ def update_tag_default(self, tag_default_id, update_tag_default_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15743,7 +15742,7 @@ def update_tag_namespace(self, tag_namespace_id, update_tag_namespace_details, * "retry_strategy", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tag_namespace got unknown kwargs: {extra_kwargs!r}") @@ -15752,16 +15751,16 @@ def update_tag_namespace(self, tag_namespace_id, update_tag_namespace_details, * "tagNamespaceId": tag_namespace_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -15853,7 +15852,7 @@ def update_user(self, user_id, update_user_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_user got unknown kwargs: {extra_kwargs!r}") @@ -15862,10 +15861,10 @@ def update_user(self, user_id, update_user_details, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15873,7 +15872,7 @@ def update_user(self, user_id, update_user_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15958,7 +15957,7 @@ def update_user_capabilities(self, user_id, update_user_capabilities_details, ** "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_user_capabilities got unknown kwargs: {extra_kwargs!r}") @@ -15967,10 +15966,10 @@ def update_user_capabilities(self, user_id, update_user_capabilities_details, ** "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15978,7 +15977,7 @@ def update_user_capabilities(self, user_id, update_user_capabilities_details, ** "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16063,7 +16062,7 @@ def update_user_state(self, user_id, update_state_details, **kwargs): "retry_strategy", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_user_state got unknown kwargs: {extra_kwargs!r}") @@ -16072,10 +16071,10 @@ def update_user_state(self, user_id, update_state_details, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16083,7 +16082,7 @@ def update_user_state(self, user_id, update_state_details, **kwargs): "content-type": "application/json", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16184,7 +16183,7 @@ def upload_api_key(self, user_id, create_api_key_details, **kwargs): "retry_strategy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_api_key got unknown kwargs: {extra_kwargs!r}") @@ -16193,10 +16192,10 @@ def upload_api_key(self, user_id, create_api_key_details, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16204,7 +16203,7 @@ def upload_api_key(self, user_id, create_api_key_details, **kwargs): "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/identity_data_plane/dataplane_client.py b/src/oci/identity_data_plane/dataplane_client.py index 37b8ed0b7f..5a5c209600 100644 --- a/src/oci/identity_data_plane/dataplane_client.py +++ b/src/oci/identity_data_plane/dataplane_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -150,7 +149,7 @@ def generate_scoped_access_token(self, generate_scoped_access_token_details, **k api_reference_link = "https://docs.oracle.com/iaas/api/#/en/identity-dp/v1/SecurityToken/GenerateScopedAccessToken" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_scoped_access_token got unknown kwargs: {extra_kwargs!r}") @@ -237,7 +236,7 @@ def generate_user_security_token(self, generate_user_security_token_details, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_user_security_token got unknown kwargs: {extra_kwargs!r}") @@ -247,7 +246,7 @@ def generate_user_security_token(self, generate_user_security_token_details, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/identity_domains/identity_domains_client.py b/src/oci/identity_domains/identity_domains_client.py index d323d7dcff..aa084d4f77 100644 --- a/src/oci/identity_domains/identity_domains_client.py +++ b/src/oci/identity_domains/identity_domains_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def create_api_key(self, **kwargs): "api_key", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_api_key got unknown kwargs: {extra_kwargs!r}") @@ -205,7 +204,7 @@ def create_api_key(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -214,7 +213,7 @@ def create_api_key(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -324,7 +323,7 @@ def create_app(self, **kwargs): "app", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_app got unknown kwargs: {extra_kwargs!r}") @@ -341,7 +340,7 @@ def create_app(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -350,7 +349,7 @@ def create_app(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -460,7 +459,7 @@ def create_app_role(self, **kwargs): "app_role", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_app_role got unknown kwargs: {extra_kwargs!r}") @@ -477,7 +476,7 @@ def create_app_role(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -486,7 +485,7 @@ def create_app_role(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -596,7 +595,7 @@ def create_approval_workflow(self, **kwargs): "approval_workflow", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_approval_workflow got unknown kwargs: {extra_kwargs!r}") @@ -613,7 +612,7 @@ def create_approval_workflow(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -622,7 +621,7 @@ def create_approval_workflow(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -732,7 +731,7 @@ def create_approval_workflow_assignment(self, **kwargs): "approval_workflow_assignment", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_approval_workflow_assignment got unknown kwargs: {extra_kwargs!r}") @@ -749,7 +748,7 @@ def create_approval_workflow_assignment(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -758,7 +757,7 @@ def create_approval_workflow_assignment(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -868,7 +867,7 @@ def create_approval_workflow_step(self, **kwargs): "approval_workflow_step", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_approval_workflow_step got unknown kwargs: {extra_kwargs!r}") @@ -885,7 +884,7 @@ def create_approval_workflow_step(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -894,7 +893,7 @@ def create_approval_workflow_step(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1004,7 +1003,7 @@ def create_auth_token(self, **kwargs): "auth_token", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -1021,7 +1020,7 @@ def create_auth_token(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1030,7 +1029,7 @@ def create_auth_token(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1130,7 +1129,7 @@ def create_authentication_factors_remover(self, **kwargs): "authentication_factors_remover", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_authentication_factors_remover got unknown kwargs: {extra_kwargs!r}") @@ -1142,7 +1141,7 @@ def create_authentication_factors_remover(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1250,7 +1249,7 @@ def create_cloud_gate(self, **kwargs): "cloud_gate", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_gate got unknown kwargs: {extra_kwargs!r}") @@ -1267,7 +1266,7 @@ def create_cloud_gate(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1276,7 +1275,7 @@ def create_cloud_gate(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1386,7 +1385,7 @@ def create_cloud_gate_mapping(self, **kwargs): "cloud_gate_mapping", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_gate_mapping got unknown kwargs: {extra_kwargs!r}") @@ -1403,7 +1402,7 @@ def create_cloud_gate_mapping(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1412,7 +1411,7 @@ def create_cloud_gate_mapping(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1522,7 +1521,7 @@ def create_cloud_gate_server(self, **kwargs): "cloud_gate_server", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cloud_gate_server got unknown kwargs: {extra_kwargs!r}") @@ -1539,7 +1538,7 @@ def create_cloud_gate_server(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1548,7 +1547,7 @@ def create_cloud_gate_server(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1658,7 +1657,7 @@ def create_condition(self, **kwargs): "condition", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_condition got unknown kwargs: {extra_kwargs!r}") @@ -1675,7 +1674,7 @@ def create_condition(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1684,7 +1683,7 @@ def create_condition(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1794,7 +1793,7 @@ def create_customer_secret_key(self, **kwargs): "customer_secret_key", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -1811,7 +1810,7 @@ def create_customer_secret_key(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1820,7 +1819,7 @@ def create_customer_secret_key(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1930,7 +1929,7 @@ def create_dynamic_resource_group(self, **kwargs): "dynamic_resource_group", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_dynamic_resource_group got unknown kwargs: {extra_kwargs!r}") @@ -1947,7 +1946,7 @@ def create_dynamic_resource_group(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -1956,7 +1955,7 @@ def create_dynamic_resource_group(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2066,7 +2065,7 @@ def create_grant(self, **kwargs): "grant", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_grant got unknown kwargs: {extra_kwargs!r}") @@ -2083,7 +2082,7 @@ def create_grant(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -2092,7 +2091,7 @@ def create_grant(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2202,7 +2201,7 @@ def create_group(self, **kwargs): "group", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_group got unknown kwargs: {extra_kwargs!r}") @@ -2219,7 +2218,7 @@ def create_group(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -2228,7 +2227,7 @@ def create_group(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2340,7 +2339,7 @@ def create_identity_propagation_trust(self, **kwargs): "identity_propagation_trust", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_identity_propagation_trust got unknown kwargs: {extra_kwargs!r}") @@ -2357,7 +2356,7 @@ def create_identity_propagation_trust(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -2366,7 +2365,7 @@ def create_identity_propagation_trust(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2476,7 +2475,7 @@ def create_identity_provider(self, **kwargs): "identity_provider", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -2493,7 +2492,7 @@ def create_identity_provider(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -2502,7 +2501,7 @@ def create_identity_provider(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2612,7 +2611,7 @@ def create_me(self, **kwargs): "me", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_me got unknown kwargs: {extra_kwargs!r}") @@ -2629,7 +2628,7 @@ def create_me(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -2638,7 +2637,7 @@ def create_me(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2738,7 +2737,7 @@ def create_my_api_key(self, **kwargs): "my_api_key", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_api_key got unknown kwargs: {extra_kwargs!r}") @@ -2750,7 +2749,7 @@ def create_my_api_key(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2848,7 +2847,7 @@ def create_my_auth_token(self, **kwargs): "my_auth_token", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -2860,7 +2859,7 @@ def create_my_auth_token(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2958,7 +2957,7 @@ def create_my_authentication_factor_initiator(self, **kwargs): "my_authentication_factor_initiator", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_authentication_factor_initiator got unknown kwargs: {extra_kwargs!r}") @@ -2970,7 +2969,7 @@ def create_my_authentication_factor_initiator(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3068,7 +3067,7 @@ def create_my_authentication_factor_validator(self, **kwargs): "my_authentication_factor_validator", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_authentication_factor_validator got unknown kwargs: {extra_kwargs!r}") @@ -3080,7 +3079,7 @@ def create_my_authentication_factor_validator(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3178,7 +3177,7 @@ def create_my_authentication_factors_remover(self, **kwargs): "my_authentication_factors_remover", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_authentication_factors_remover got unknown kwargs: {extra_kwargs!r}") @@ -3190,7 +3189,7 @@ def create_my_authentication_factors_remover(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3288,7 +3287,7 @@ def create_my_customer_secret_key(self, **kwargs): "my_customer_secret_key", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -3300,7 +3299,7 @@ def create_my_customer_secret_key(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3398,7 +3397,7 @@ def create_my_o_auth2_client_credential(self, **kwargs): "my_o_auth2_client_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -3410,7 +3409,7 @@ def create_my_o_auth2_client_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3518,7 +3517,7 @@ def create_my_request(self, **kwargs): "my_request", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_request got unknown kwargs: {extra_kwargs!r}") @@ -3535,7 +3534,7 @@ def create_my_request(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -3544,7 +3543,7 @@ def create_my_request(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3644,7 +3643,7 @@ def create_my_smtp_credential(self, **kwargs): "my_smtp_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -3656,7 +3655,7 @@ def create_my_smtp_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3754,7 +3753,7 @@ def create_my_support_account(self, **kwargs): "my_support_account", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_support_account got unknown kwargs: {extra_kwargs!r}") @@ -3766,7 +3765,7 @@ def create_my_support_account(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3864,7 +3863,7 @@ def create_my_user_db_credential(self, **kwargs): "my_user_db_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_my_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -3876,7 +3875,7 @@ def create_my_user_db_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3984,7 +3983,7 @@ def create_network_perimeter(self, **kwargs): "network_perimeter", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_perimeter got unknown kwargs: {extra_kwargs!r}") @@ -4001,7 +4000,7 @@ def create_network_perimeter(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4010,7 +4009,7 @@ def create_network_perimeter(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4120,7 +4119,7 @@ def create_o_auth2_client_credential(self, **kwargs): "o_auth2_client_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -4137,7 +4136,7 @@ def create_o_auth2_client_credential(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4146,7 +4145,7 @@ def create_o_auth2_client_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4246,7 +4245,7 @@ def create_o_auth_client_certificate(self, **kwargs): "o_auth_client_certificate", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_o_auth_client_certificate got unknown kwargs: {extra_kwargs!r}") @@ -4258,7 +4257,7 @@ def create_o_auth_client_certificate(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4356,7 +4355,7 @@ def create_o_auth_partner_certificate(self, **kwargs): "o_auth_partner_certificate", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_o_auth_partner_certificate got unknown kwargs: {extra_kwargs!r}") @@ -4368,7 +4367,7 @@ def create_o_auth_partner_certificate(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4476,7 +4475,7 @@ def create_password_policy(self, **kwargs): "password_policy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_password_policy got unknown kwargs: {extra_kwargs!r}") @@ -4493,7 +4492,7 @@ def create_password_policy(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4502,7 +4501,7 @@ def create_password_policy(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4612,7 +4611,7 @@ def create_policy(self, **kwargs): "policy", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_policy got unknown kwargs: {extra_kwargs!r}") @@ -4629,7 +4628,7 @@ def create_policy(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4638,7 +4637,7 @@ def create_policy(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4748,7 +4747,7 @@ def create_rule(self, **kwargs): "rule", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rule got unknown kwargs: {extra_kwargs!r}") @@ -4765,7 +4764,7 @@ def create_rule(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4774,7 +4773,7 @@ def create_rule(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4884,7 +4883,7 @@ def create_security_question(self, **kwargs): "security_question", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_question got unknown kwargs: {extra_kwargs!r}") @@ -4901,7 +4900,7 @@ def create_security_question(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -4910,7 +4909,7 @@ def create_security_question(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5020,7 +5019,7 @@ def create_self_registration_profile(self, **kwargs): "self_registration_profile", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_self_registration_profile got unknown kwargs: {extra_kwargs!r}") @@ -5037,7 +5036,7 @@ def create_self_registration_profile(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5046,7 +5045,7 @@ def create_self_registration_profile(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5156,7 +5155,7 @@ def create_smtp_credential(self, **kwargs): "smtp_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -5173,7 +5172,7 @@ def create_smtp_credential(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5182,7 +5181,7 @@ def create_smtp_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5292,7 +5291,7 @@ def create_user(self, **kwargs): "user", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user got unknown kwargs: {extra_kwargs!r}") @@ -5309,7 +5308,7 @@ def create_user(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5318,7 +5317,7 @@ def create_user(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5428,7 +5427,7 @@ def create_user_db_credential(self, **kwargs): "user_db_credential", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -5445,7 +5444,7 @@ def create_user_db_credential(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5454,7 +5453,7 @@ def create_user_db_credential(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5549,7 +5548,7 @@ def delete_api_key(self, api_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_api_key got unknown kwargs: {extra_kwargs!r}") @@ -5558,16 +5557,16 @@ def delete_api_key(self, api_key_id, **kwargs): "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5577,7 +5576,7 @@ def delete_api_key(self, api_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5670,7 +5669,7 @@ def delete_app(self, app_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_app got unknown kwargs: {extra_kwargs!r}") @@ -5679,16 +5678,16 @@ def delete_app(self, app_id, **kwargs): "appId": app_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5698,7 +5697,7 @@ def delete_app(self, app_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5791,7 +5790,7 @@ def delete_app_role(self, app_role_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_app_role got unknown kwargs: {extra_kwargs!r}") @@ -5800,16 +5799,16 @@ def delete_app_role(self, app_role_id, **kwargs): "appRoleId": app_role_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5819,7 +5818,7 @@ def delete_app_role(self, app_role_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5912,7 +5911,7 @@ def delete_approval_workflow(self, approval_workflow_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_approval_workflow got unknown kwargs: {extra_kwargs!r}") @@ -5921,16 +5920,16 @@ def delete_approval_workflow(self, approval_workflow_id, **kwargs): "approvalWorkflowId": approval_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -5940,7 +5939,7 @@ def delete_approval_workflow(self, approval_workflow_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6033,7 +6032,7 @@ def delete_approval_workflow_assignment(self, approval_workflow_assignment_id, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_approval_workflow_assignment got unknown kwargs: {extra_kwargs!r}") @@ -6042,16 +6041,16 @@ def delete_approval_workflow_assignment(self, approval_workflow_assignment_id, * "approvalWorkflowAssignmentId": approval_workflow_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6061,7 +6060,7 @@ def delete_approval_workflow_assignment(self, approval_workflow_assignment_id, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6154,7 +6153,7 @@ def delete_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_approval_workflow_step got unknown kwargs: {extra_kwargs!r}") @@ -6163,16 +6162,16 @@ def delete_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "approvalWorkflowStepId": approval_workflow_step_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6182,7 +6181,7 @@ def delete_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6275,7 +6274,7 @@ def delete_auth_token(self, auth_token_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -6284,16 +6283,16 @@ def delete_auth_token(self, auth_token_id, **kwargs): "authTokenId": auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6303,7 +6302,7 @@ def delete_auth_token(self, auth_token_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6396,7 +6395,7 @@ def delete_cloud_gate(self, cloud_gate_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_gate got unknown kwargs: {extra_kwargs!r}") @@ -6405,16 +6404,16 @@ def delete_cloud_gate(self, cloud_gate_id, **kwargs): "cloudGateId": cloud_gate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6424,7 +6423,7 @@ def delete_cloud_gate(self, cloud_gate_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6517,7 +6516,7 @@ def delete_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_gate_mapping got unknown kwargs: {extra_kwargs!r}") @@ -6526,16 +6525,16 @@ def delete_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "cloudGateMappingId": cloud_gate_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6545,7 +6544,7 @@ def delete_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6638,7 +6637,7 @@ def delete_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cloud_gate_server got unknown kwargs: {extra_kwargs!r}") @@ -6647,16 +6646,16 @@ def delete_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "cloudGateServerId": cloud_gate_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6666,7 +6665,7 @@ def delete_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6759,7 +6758,7 @@ def delete_condition(self, condition_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_condition got unknown kwargs: {extra_kwargs!r}") @@ -6768,16 +6767,16 @@ def delete_condition(self, condition_id, **kwargs): "conditionId": condition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6787,7 +6786,7 @@ def delete_condition(self, condition_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6880,7 +6879,7 @@ def delete_customer_secret_key(self, customer_secret_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -6889,16 +6888,16 @@ def delete_customer_secret_key(self, customer_secret_key_id, **kwargs): "customerSecretKeyId": customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -6908,7 +6907,7 @@ def delete_customer_secret_key(self, customer_secret_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7001,7 +7000,7 @@ def delete_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_dynamic_resource_group got unknown kwargs: {extra_kwargs!r}") @@ -7010,16 +7009,16 @@ def delete_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "dynamicResourceGroupId": dynamic_resource_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7029,7 +7028,7 @@ def delete_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7122,7 +7121,7 @@ def delete_grant(self, grant_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_grant got unknown kwargs: {extra_kwargs!r}") @@ -7131,16 +7130,16 @@ def delete_grant(self, grant_id, **kwargs): "grantId": grant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7150,7 +7149,7 @@ def delete_grant(self, grant_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7243,7 +7242,7 @@ def delete_group(self, group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_group got unknown kwargs: {extra_kwargs!r}") @@ -7252,16 +7251,16 @@ def delete_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7271,7 +7270,7 @@ def delete_group(self, group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7364,7 +7363,7 @@ def delete_identity_propagation_trust(self, identity_propagation_trust_id, **kwa "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_identity_propagation_trust got unknown kwargs: {extra_kwargs!r}") @@ -7373,16 +7372,16 @@ def delete_identity_propagation_trust(self, identity_propagation_trust_id, **kwa "identityPropagationTrustId": identity_propagation_trust_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7392,7 +7391,7 @@ def delete_identity_propagation_trust(self, identity_propagation_trust_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7485,7 +7484,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -7494,16 +7493,16 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7513,7 +7512,7 @@ def delete_identity_provider(self, identity_provider_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7606,7 +7605,7 @@ def delete_my_api_key(self, my_api_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_api_key got unknown kwargs: {extra_kwargs!r}") @@ -7615,16 +7614,16 @@ def delete_my_api_key(self, my_api_key_id, **kwargs): "myApiKeyId": my_api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7634,7 +7633,7 @@ def delete_my_api_key(self, my_api_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7727,7 +7726,7 @@ def delete_my_auth_token(self, my_auth_token_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -7736,16 +7735,16 @@ def delete_my_auth_token(self, my_auth_token_id, **kwargs): "myAuthTokenId": my_auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7755,7 +7754,7 @@ def delete_my_auth_token(self, my_auth_token_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7848,7 +7847,7 @@ def delete_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -7857,16 +7856,16 @@ def delete_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "myCustomerSecretKeyId": my_customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7876,7 +7875,7 @@ def delete_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7969,7 +7968,7 @@ def delete_my_device(self, my_device_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_device got unknown kwargs: {extra_kwargs!r}") @@ -7978,16 +7977,16 @@ def delete_my_device(self, my_device_id, **kwargs): "myDeviceId": my_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -7997,7 +7996,7 @@ def delete_my_device(self, my_device_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8090,7 +8089,7 @@ def delete_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -8099,16 +8098,16 @@ def delete_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, * "myOAuth2ClientCredentialId": my_o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8118,7 +8117,7 @@ def delete_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8211,7 +8210,7 @@ def delete_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -8220,16 +8219,16 @@ def delete_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "mySmtpCredentialId": my_smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8239,7 +8238,7 @@ def delete_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8332,7 +8331,7 @@ def delete_my_support_account(self, my_support_account_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_support_account got unknown kwargs: {extra_kwargs!r}") @@ -8341,16 +8340,16 @@ def delete_my_support_account(self, my_support_account_id, **kwargs): "mySupportAccountId": my_support_account_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8360,7 +8359,7 @@ def delete_my_support_account(self, my_support_account_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8453,7 +8452,7 @@ def delete_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_trusted_user_agent got unknown kwargs: {extra_kwargs!r}") @@ -8462,16 +8461,16 @@ def delete_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "myTrustedUserAgentId": my_trusted_user_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8481,7 +8480,7 @@ def delete_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8574,7 +8573,7 @@ def delete_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_my_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -8583,16 +8582,16 @@ def delete_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "myUserDbCredentialId": my_user_db_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8602,7 +8601,7 @@ def delete_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8695,7 +8694,7 @@ def delete_network_perimeter(self, network_perimeter_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_perimeter got unknown kwargs: {extra_kwargs!r}") @@ -8704,16 +8703,16 @@ def delete_network_perimeter(self, network_perimeter_id, **kwargs): "networkPerimeterId": network_perimeter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8723,7 +8722,7 @@ def delete_network_perimeter(self, network_perimeter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8816,7 +8815,7 @@ def delete_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwarg "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -8825,16 +8824,16 @@ def delete_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwarg "oAuth2ClientCredentialId": o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8844,7 +8843,7 @@ def delete_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8937,7 +8936,7 @@ def delete_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwarg "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_o_auth_client_certificate got unknown kwargs: {extra_kwargs!r}") @@ -8946,16 +8945,16 @@ def delete_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwarg "oAuthClientCertificateId": o_auth_client_certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -8965,7 +8964,7 @@ def delete_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9058,7 +9057,7 @@ def delete_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwa "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_o_auth_partner_certificate got unknown kwargs: {extra_kwargs!r}") @@ -9067,16 +9066,16 @@ def delete_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwa "oAuthPartnerCertificateId": o_auth_partner_certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9086,7 +9085,7 @@ def delete_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9179,7 +9178,7 @@ def delete_password_policy(self, password_policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_password_policy got unknown kwargs: {extra_kwargs!r}") @@ -9188,16 +9187,16 @@ def delete_password_policy(self, password_policy_id, **kwargs): "passwordPolicyId": password_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9207,7 +9206,7 @@ def delete_password_policy(self, password_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9300,7 +9299,7 @@ def delete_policy(self, policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_policy got unknown kwargs: {extra_kwargs!r}") @@ -9309,16 +9308,16 @@ def delete_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9328,7 +9327,7 @@ def delete_policy(self, policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9421,7 +9420,7 @@ def delete_rule(self, rule_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rule got unknown kwargs: {extra_kwargs!r}") @@ -9430,16 +9429,16 @@ def delete_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9449,7 +9448,7 @@ def delete_rule(self, rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9542,7 +9541,7 @@ def delete_security_question(self, security_question_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_question got unknown kwargs: {extra_kwargs!r}") @@ -9551,16 +9550,16 @@ def delete_security_question(self, security_question_id, **kwargs): "securityQuestionId": security_question_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9570,7 +9569,7 @@ def delete_security_question(self, security_question_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9663,7 +9662,7 @@ def delete_self_registration_profile(self, self_registration_profile_id, **kwarg "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_self_registration_profile got unknown kwargs: {extra_kwargs!r}") @@ -9672,16 +9671,16 @@ def delete_self_registration_profile(self, self_registration_profile_id, **kwarg "selfRegistrationProfileId": self_registration_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9691,7 +9690,7 @@ def delete_self_registration_profile(self, self_registration_profile_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9784,7 +9783,7 @@ def delete_smtp_credential(self, smtp_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -9793,16 +9792,16 @@ def delete_smtp_credential(self, smtp_credential_id, **kwargs): "smtpCredentialId": smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9812,7 +9811,7 @@ def delete_smtp_credential(self, smtp_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9905,7 +9904,7 @@ def delete_user(self, user_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user got unknown kwargs: {extra_kwargs!r}") @@ -9914,16 +9913,16 @@ def delete_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -9933,7 +9932,7 @@ def delete_user(self, user_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10026,7 +10025,7 @@ def delete_user_db_credential(self, user_db_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -10035,16 +10034,16 @@ def delete_user_db_credential(self, user_db_credential_id, **kwargs): "userDbCredentialId": user_db_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "forceDelete": kwargs.get("force_delete", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10054,7 +10053,7 @@ def delete_user_db_credential(self, user_db_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10149,7 +10148,7 @@ def get_account_mgmt_info(self, account_mgmt_info_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_account_mgmt_info got unknown kwargs: {extra_kwargs!r}") @@ -10158,10 +10157,10 @@ def get_account_mgmt_info(self, account_mgmt_info_id, **kwargs): "accountMgmtInfoId": account_mgmt_info_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10176,7 +10175,7 @@ def get_account_mgmt_info(self, account_mgmt_info_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10185,7 +10184,7 @@ def get_account_mgmt_info(self, account_mgmt_info_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10282,7 +10281,7 @@ def get_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_account_recovery_setting got unknown kwargs: {extra_kwargs!r}") @@ -10291,10 +10290,10 @@ def get_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "accountRecoverySettingId": account_recovery_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10309,7 +10308,7 @@ def get_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10318,7 +10317,7 @@ def get_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10415,7 +10414,7 @@ def get_api_key(self, api_key_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_api_key got unknown kwargs: {extra_kwargs!r}") @@ -10424,10 +10423,10 @@ def get_api_key(self, api_key_id, **kwargs): "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10442,7 +10441,7 @@ def get_api_key(self, api_key_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10451,7 +10450,7 @@ def get_api_key(self, api_key_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10548,7 +10547,7 @@ def get_app(self, app_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_app got unknown kwargs: {extra_kwargs!r}") @@ -10557,10 +10556,10 @@ def get_app(self, app_id, **kwargs): "appId": app_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10575,7 +10574,7 @@ def get_app(self, app_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10584,7 +10583,7 @@ def get_app(self, app_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10681,7 +10680,7 @@ def get_app_role(self, app_role_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_app_role got unknown kwargs: {extra_kwargs!r}") @@ -10690,10 +10689,10 @@ def get_app_role(self, app_role_id, **kwargs): "appRoleId": app_role_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10708,7 +10707,7 @@ def get_app_role(self, app_role_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10717,7 +10716,7 @@ def get_app_role(self, app_role_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10814,7 +10813,7 @@ def get_approval_workflow(self, approval_workflow_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_approval_workflow got unknown kwargs: {extra_kwargs!r}") @@ -10823,10 +10822,10 @@ def get_approval_workflow(self, approval_workflow_id, **kwargs): "approvalWorkflowId": approval_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10841,7 +10840,7 @@ def get_approval_workflow(self, approval_workflow_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10850,7 +10849,7 @@ def get_approval_workflow(self, approval_workflow_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10947,7 +10946,7 @@ def get_approval_workflow_assignment(self, approval_workflow_assignment_id, **kw "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_approval_workflow_assignment got unknown kwargs: {extra_kwargs!r}") @@ -10956,10 +10955,10 @@ def get_approval_workflow_assignment(self, approval_workflow_assignment_id, **kw "approvalWorkflowAssignmentId": approval_workflow_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -10974,7 +10973,7 @@ def get_approval_workflow_assignment(self, approval_workflow_assignment_id, **kw "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -10983,7 +10982,7 @@ def get_approval_workflow_assignment(self, approval_workflow_assignment_id, **kw "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11080,7 +11079,7 @@ def get_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_approval_workflow_step got unknown kwargs: {extra_kwargs!r}") @@ -11089,10 +11088,10 @@ def get_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "approvalWorkflowStepId": approval_workflow_step_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11107,7 +11106,7 @@ def get_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11116,7 +11115,7 @@ def get_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11213,7 +11212,7 @@ def get_auth_token(self, auth_token_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -11222,10 +11221,10 @@ def get_auth_token(self, auth_token_id, **kwargs): "authTokenId": auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11240,7 +11239,7 @@ def get_auth_token(self, auth_token_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11249,7 +11248,7 @@ def get_auth_token(self, auth_token_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11346,7 +11345,7 @@ def get_authentication_factor_setting(self, authentication_factor_setting_id, ** "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_authentication_factor_setting got unknown kwargs: {extra_kwargs!r}") @@ -11355,10 +11354,10 @@ def get_authentication_factor_setting(self, authentication_factor_setting_id, ** "authenticationFactorSettingId": authentication_factor_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11373,7 +11372,7 @@ def get_authentication_factor_setting(self, authentication_factor_setting_id, ** "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11382,7 +11381,7 @@ def get_authentication_factor_setting(self, authentication_factor_setting_id, ** "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11479,7 +11478,7 @@ def get_branding_setting(self, branding_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_branding_setting got unknown kwargs: {extra_kwargs!r}") @@ -11488,10 +11487,10 @@ def get_branding_setting(self, branding_setting_id, **kwargs): "brandingSettingId": branding_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11506,7 +11505,7 @@ def get_branding_setting(self, branding_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11515,7 +11514,7 @@ def get_branding_setting(self, branding_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11612,7 +11611,7 @@ def get_cloud_gate(self, cloud_gate_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_gate got unknown kwargs: {extra_kwargs!r}") @@ -11621,10 +11620,10 @@ def get_cloud_gate(self, cloud_gate_id, **kwargs): "cloudGateId": cloud_gate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11639,7 +11638,7 @@ def get_cloud_gate(self, cloud_gate_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11648,7 +11647,7 @@ def get_cloud_gate(self, cloud_gate_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11745,7 +11744,7 @@ def get_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_gate_mapping got unknown kwargs: {extra_kwargs!r}") @@ -11754,10 +11753,10 @@ def get_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "cloudGateMappingId": cloud_gate_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11772,7 +11771,7 @@ def get_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11781,7 +11780,7 @@ def get_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11878,7 +11877,7 @@ def get_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cloud_gate_server got unknown kwargs: {extra_kwargs!r}") @@ -11887,10 +11886,10 @@ def get_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "cloudGateServerId": cloud_gate_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -11905,7 +11904,7 @@ def get_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -11914,7 +11913,7 @@ def get_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12011,7 +12010,7 @@ def get_condition(self, condition_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_condition got unknown kwargs: {extra_kwargs!r}") @@ -12020,10 +12019,10 @@ def get_condition(self, condition_id, **kwargs): "conditionId": condition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12038,7 +12037,7 @@ def get_condition(self, condition_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12047,7 +12046,7 @@ def get_condition(self, condition_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12144,7 +12143,7 @@ def get_customer_secret_key(self, customer_secret_key_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -12153,10 +12152,10 @@ def get_customer_secret_key(self, customer_secret_key_id, **kwargs): "customerSecretKeyId": customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12171,7 +12170,7 @@ def get_customer_secret_key(self, customer_secret_key_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12180,7 +12179,7 @@ def get_customer_secret_key(self, customer_secret_key_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12277,7 +12276,7 @@ def get_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_dynamic_resource_group got unknown kwargs: {extra_kwargs!r}") @@ -12286,10 +12285,10 @@ def get_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "dynamicResourceGroupId": dynamic_resource_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12304,7 +12303,7 @@ def get_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12313,7 +12312,7 @@ def get_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12410,7 +12409,7 @@ def get_grant(self, grant_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_grant got unknown kwargs: {extra_kwargs!r}") @@ -12419,10 +12418,10 @@ def get_grant(self, grant_id, **kwargs): "grantId": grant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12437,7 +12436,7 @@ def get_grant(self, grant_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12446,7 +12445,7 @@ def get_grant(self, grant_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12543,7 +12542,7 @@ def get_group(self, group_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_group got unknown kwargs: {extra_kwargs!r}") @@ -12552,10 +12551,10 @@ def get_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12570,7 +12569,7 @@ def get_group(self, group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12579,7 +12578,7 @@ def get_group(self, group_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12676,7 +12675,7 @@ def get_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_identity_propagation_trust got unknown kwargs: {extra_kwargs!r}") @@ -12685,10 +12684,10 @@ def get_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "identityPropagationTrustId": identity_propagation_trust_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12703,7 +12702,7 @@ def get_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12712,7 +12711,7 @@ def get_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12809,7 +12808,7 @@ def get_identity_provider(self, identity_provider_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -12818,10 +12817,10 @@ def get_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12836,7 +12835,7 @@ def get_identity_provider(self, identity_provider_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12845,7 +12844,7 @@ def get_identity_provider(self, identity_provider_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12942,7 +12941,7 @@ def get_identity_setting(self, identity_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_identity_setting got unknown kwargs: {extra_kwargs!r}") @@ -12951,10 +12950,10 @@ def get_identity_setting(self, identity_setting_id, **kwargs): "identitySettingId": identity_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -12969,7 +12968,7 @@ def get_identity_setting(self, identity_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -12978,7 +12977,7 @@ def get_identity_setting(self, identity_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13075,7 +13074,7 @@ def get_kmsi_setting(self, kmsi_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_kmsi_setting got unknown kwargs: {extra_kwargs!r}") @@ -13084,10 +13083,10 @@ def get_kmsi_setting(self, kmsi_setting_id, **kwargs): "kmsiSettingId": kmsi_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -13102,7 +13101,7 @@ def get_kmsi_setting(self, kmsi_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -13111,7 +13110,7 @@ def get_kmsi_setting(self, kmsi_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13205,7 +13204,7 @@ def get_me(self, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_me got unknown kwargs: {extra_kwargs!r}") @@ -13222,7 +13221,7 @@ def get_me(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -13231,7 +13230,7 @@ def get_me(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13316,7 +13315,7 @@ def get_my_api_key(self, my_api_key_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_api_key got unknown kwargs: {extra_kwargs!r}") @@ -13325,10 +13324,10 @@ def get_my_api_key(self, my_api_key_id, **kwargs): "myApiKeyId": my_api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13338,7 +13337,7 @@ def get_my_api_key(self, my_api_key_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13423,7 +13422,7 @@ def get_my_auth_token(self, my_auth_token_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -13432,10 +13431,10 @@ def get_my_auth_token(self, my_auth_token_id, **kwargs): "myAuthTokenId": my_auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13445,7 +13444,7 @@ def get_my_auth_token(self, my_auth_token_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13530,7 +13529,7 @@ def get_my_completed_approval(self, my_completed_approval_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_completed_approval got unknown kwargs: {extra_kwargs!r}") @@ -13539,10 +13538,10 @@ def get_my_completed_approval(self, my_completed_approval_id, **kwargs): "myCompletedApprovalId": my_completed_approval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13552,7 +13551,7 @@ def get_my_completed_approval(self, my_completed_approval_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13637,7 +13636,7 @@ def get_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -13646,10 +13645,10 @@ def get_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "myCustomerSecretKeyId": my_customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13659,7 +13658,7 @@ def get_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13754,7 +13753,7 @@ def get_my_device(self, my_device_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_device got unknown kwargs: {extra_kwargs!r}") @@ -13763,10 +13762,10 @@ def get_my_device(self, my_device_id, **kwargs): "myDeviceId": my_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -13781,7 +13780,7 @@ def get_my_device(self, my_device_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -13790,7 +13789,7 @@ def get_my_device(self, my_device_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13877,7 +13876,7 @@ def get_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, **kw "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -13886,10 +13885,10 @@ def get_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, **kw "myOAuth2ClientCredentialId": my_o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13899,7 +13898,7 @@ def get_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, **kw "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13984,7 +13983,7 @@ def get_my_pending_approval(self, my_pending_approval_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_pending_approval got unknown kwargs: {extra_kwargs!r}") @@ -13993,10 +13992,10 @@ def get_my_pending_approval(self, my_pending_approval_id, **kwargs): "myPendingApprovalId": my_pending_approval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14006,7 +14005,7 @@ def get_my_pending_approval(self, my_pending_approval_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14101,7 +14100,7 @@ def get_my_request(self, my_request_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_request got unknown kwargs: {extra_kwargs!r}") @@ -14110,10 +14109,10 @@ def get_my_request(self, my_request_id, **kwargs): "myRequestId": my_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -14128,7 +14127,7 @@ def get_my_request(self, my_request_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -14137,7 +14136,7 @@ def get_my_request(self, my_request_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14224,7 +14223,7 @@ def get_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -14233,10 +14232,10 @@ def get_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "mySmtpCredentialId": my_smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14246,7 +14245,7 @@ def get_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14331,7 +14330,7 @@ def get_my_support_account(self, my_support_account_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_support_account got unknown kwargs: {extra_kwargs!r}") @@ -14340,10 +14339,10 @@ def get_my_support_account(self, my_support_account_id, **kwargs): "mySupportAccountId": my_support_account_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14353,7 +14352,7 @@ def get_my_support_account(self, my_support_account_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14448,7 +14447,7 @@ def get_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_trusted_user_agent got unknown kwargs: {extra_kwargs!r}") @@ -14457,10 +14456,10 @@ def get_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "myTrustedUserAgentId": my_trusted_user_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -14475,7 +14474,7 @@ def get_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -14484,7 +14483,7 @@ def get_my_trusted_user_agent(self, my_trusted_user_agent_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14571,7 +14570,7 @@ def get_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_my_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -14580,10 +14579,10 @@ def get_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "myUserDbCredentialId": my_user_db_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14593,7 +14592,7 @@ def get_my_user_db_credential(self, my_user_db_credential_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14688,7 +14687,7 @@ def get_network_perimeter(self, network_perimeter_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_perimeter got unknown kwargs: {extra_kwargs!r}") @@ -14697,10 +14696,10 @@ def get_network_perimeter(self, network_perimeter_id, **kwargs): "networkPerimeterId": network_perimeter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -14715,7 +14714,7 @@ def get_network_perimeter(self, network_perimeter_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -14724,7 +14723,7 @@ def get_network_perimeter(self, network_perimeter_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14821,7 +14820,7 @@ def get_notification_setting(self, notification_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_notification_setting got unknown kwargs: {extra_kwargs!r}") @@ -14830,10 +14829,10 @@ def get_notification_setting(self, notification_setting_id, **kwargs): "notificationSettingId": notification_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -14848,7 +14847,7 @@ def get_notification_setting(self, notification_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -14857,7 +14856,7 @@ def get_notification_setting(self, notification_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14954,7 +14953,7 @@ def get_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -14963,10 +14962,10 @@ def get_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs): "oAuth2ClientCredentialId": o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -14981,7 +14980,7 @@ def get_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -14990,7 +14989,7 @@ def get_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15077,7 +15076,7 @@ def get_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_o_auth_client_certificate got unknown kwargs: {extra_kwargs!r}") @@ -15086,10 +15085,10 @@ def get_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwargs): "oAuthClientCertificateId": o_auth_client_certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15099,7 +15098,7 @@ def get_o_auth_client_certificate(self, o_auth_client_certificate_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15184,7 +15183,7 @@ def get_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwargs "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_o_auth_partner_certificate got unknown kwargs: {extra_kwargs!r}") @@ -15193,10 +15192,10 @@ def get_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwargs "oAuthPartnerCertificateId": o_auth_partner_certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15206,7 +15205,7 @@ def get_o_auth_partner_certificate(self, o_auth_partner_certificate_id, **kwargs "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15301,7 +15300,7 @@ def get_password_policy(self, password_policy_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_password_policy got unknown kwargs: {extra_kwargs!r}") @@ -15310,10 +15309,10 @@ def get_password_policy(self, password_policy_id, **kwargs): "passwordPolicyId": password_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -15328,7 +15327,7 @@ def get_password_policy(self, password_policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -15337,7 +15336,7 @@ def get_password_policy(self, password_policy_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15434,7 +15433,7 @@ def get_policy(self, policy_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_policy got unknown kwargs: {extra_kwargs!r}") @@ -15443,10 +15442,10 @@ def get_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -15461,7 +15460,7 @@ def get_policy(self, policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -15470,7 +15469,7 @@ def get_policy(self, policy_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15567,7 +15566,7 @@ def get_rule(self, rule_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rule got unknown kwargs: {extra_kwargs!r}") @@ -15576,10 +15575,10 @@ def get_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -15594,7 +15593,7 @@ def get_rule(self, rule_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -15603,7 +15602,7 @@ def get_rule(self, rule_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15690,7 +15689,7 @@ def get_schema(self, schema_id, **kwargs): "resource_type_schema_version", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_schema got unknown kwargs: {extra_kwargs!r}") @@ -15699,10 +15698,10 @@ def get_schema(self, schema_id, **kwargs): "schemaId": schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15712,7 +15711,7 @@ def get_schema(self, schema_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15807,7 +15806,7 @@ def get_security_question(self, security_question_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_question got unknown kwargs: {extra_kwargs!r}") @@ -15816,10 +15815,10 @@ def get_security_question(self, security_question_id, **kwargs): "securityQuestionId": security_question_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -15834,7 +15833,7 @@ def get_security_question(self, security_question_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -15843,7 +15842,7 @@ def get_security_question(self, security_question_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15940,7 +15939,7 @@ def get_security_question_setting(self, security_question_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_question_setting got unknown kwargs: {extra_kwargs!r}") @@ -15949,10 +15948,10 @@ def get_security_question_setting(self, security_question_setting_id, **kwargs): "securityQuestionSettingId": security_question_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -15967,7 +15966,7 @@ def get_security_question_setting(self, security_question_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -15976,7 +15975,7 @@ def get_security_question_setting(self, security_question_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16073,7 +16072,7 @@ def get_self_registration_profile(self, self_registration_profile_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_self_registration_profile got unknown kwargs: {extra_kwargs!r}") @@ -16082,10 +16081,10 @@ def get_self_registration_profile(self, self_registration_profile_id, **kwargs): "selfRegistrationProfileId": self_registration_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16100,7 +16099,7 @@ def get_self_registration_profile(self, self_registration_profile_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16109,7 +16108,7 @@ def get_self_registration_profile(self, self_registration_profile_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16206,7 +16205,7 @@ def get_setting(self, setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_setting got unknown kwargs: {extra_kwargs!r}") @@ -16215,10 +16214,10 @@ def get_setting(self, setting_id, **kwargs): "settingId": setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16233,7 +16232,7 @@ def get_setting(self, setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16242,7 +16241,7 @@ def get_setting(self, setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16339,7 +16338,7 @@ def get_smtp_credential(self, smtp_credential_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -16348,10 +16347,10 @@ def get_smtp_credential(self, smtp_credential_id, **kwargs): "smtpCredentialId": smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16366,7 +16365,7 @@ def get_smtp_credential(self, smtp_credential_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16375,7 +16374,7 @@ def get_smtp_credential(self, smtp_credential_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16472,7 +16471,7 @@ def get_user(self, user_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user got unknown kwargs: {extra_kwargs!r}") @@ -16481,10 +16480,10 @@ def get_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16499,7 +16498,7 @@ def get_user(self, user_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16508,7 +16507,7 @@ def get_user(self, user_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16605,7 +16604,7 @@ def get_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_attributes_setting got unknown kwargs: {extra_kwargs!r}") @@ -16614,10 +16613,10 @@ def get_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "userAttributesSettingId": user_attributes_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16632,7 +16631,7 @@ def get_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16641,7 +16640,7 @@ def get_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16738,7 +16737,7 @@ def get_user_db_credential(self, user_db_credential_id, **kwargs): "attribute_sets", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_user_db_credential got unknown kwargs: {extra_kwargs!r}") @@ -16747,10 +16746,10 @@ def get_user_db_credential(self, user_db_credential_id, **kwargs): "userDbCredentialId": user_db_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -16765,7 +16764,7 @@ def get_user_db_credential(self, user_db_credential_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16774,7 +16773,7 @@ def get_user_db_credential(self, user_db_credential_id, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16900,7 +16899,7 @@ def list_account_mgmt_infos(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_account_mgmt_infos got unknown kwargs: {extra_kwargs!r}") @@ -16931,7 +16930,7 @@ def list_account_mgmt_infos(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -16940,7 +16939,7 @@ def list_account_mgmt_infos(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17040,7 +17039,7 @@ def list_account_recovery_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_account_recovery_settings got unknown kwargs: {extra_kwargs!r}") @@ -17059,7 +17058,7 @@ def list_account_recovery_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17068,7 +17067,7 @@ def list_account_recovery_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17192,7 +17191,7 @@ def list_api_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_api_keys got unknown kwargs: {extra_kwargs!r}") @@ -17223,7 +17222,7 @@ def list_api_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17232,7 +17231,7 @@ def list_api_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17356,7 +17355,7 @@ def list_app_roles(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_app_roles got unknown kwargs: {extra_kwargs!r}") @@ -17387,7 +17386,7 @@ def list_app_roles(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17396,7 +17395,7 @@ def list_app_roles(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17520,7 +17519,7 @@ def list_approval_workflow_assignments(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_approval_workflow_assignments got unknown kwargs: {extra_kwargs!r}") @@ -17551,7 +17550,7 @@ def list_approval_workflow_assignments(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17560,7 +17559,7 @@ def list_approval_workflow_assignments(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17684,7 +17683,7 @@ def list_approval_workflow_steps(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_approval_workflow_steps got unknown kwargs: {extra_kwargs!r}") @@ -17715,7 +17714,7 @@ def list_approval_workflow_steps(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17724,7 +17723,7 @@ def list_approval_workflow_steps(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17848,7 +17847,7 @@ def list_approval_workflows(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_approval_workflows got unknown kwargs: {extra_kwargs!r}") @@ -17879,7 +17878,7 @@ def list_approval_workflows(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -17888,7 +17887,7 @@ def list_approval_workflows(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18012,7 +18011,7 @@ def list_apps(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_apps got unknown kwargs: {extra_kwargs!r}") @@ -18043,7 +18042,7 @@ def list_apps(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18052,7 +18051,7 @@ def list_apps(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18176,7 +18175,7 @@ def list_auth_tokens(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auth_tokens got unknown kwargs: {extra_kwargs!r}") @@ -18207,7 +18206,7 @@ def list_auth_tokens(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18216,7 +18215,7 @@ def list_auth_tokens(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18316,7 +18315,7 @@ def list_authentication_factor_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_authentication_factor_settings got unknown kwargs: {extra_kwargs!r}") @@ -18335,7 +18334,7 @@ def list_authentication_factor_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18344,7 +18343,7 @@ def list_authentication_factor_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18444,7 +18443,7 @@ def list_branding_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_branding_settings got unknown kwargs: {extra_kwargs!r}") @@ -18463,7 +18462,7 @@ def list_branding_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18472,7 +18471,7 @@ def list_branding_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18596,7 +18595,7 @@ def list_cloud_gate_mappings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_gate_mappings got unknown kwargs: {extra_kwargs!r}") @@ -18627,7 +18626,7 @@ def list_cloud_gate_mappings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18636,7 +18635,7 @@ def list_cloud_gate_mappings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18760,7 +18759,7 @@ def list_cloud_gate_servers(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_gate_servers got unknown kwargs: {extra_kwargs!r}") @@ -18791,7 +18790,7 @@ def list_cloud_gate_servers(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18800,7 +18799,7 @@ def list_cloud_gate_servers(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18924,7 +18923,7 @@ def list_cloud_gates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_cloud_gates got unknown kwargs: {extra_kwargs!r}") @@ -18955,7 +18954,7 @@ def list_cloud_gates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -18964,7 +18963,7 @@ def list_cloud_gates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19088,7 +19087,7 @@ def list_conditions(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_conditions got unknown kwargs: {extra_kwargs!r}") @@ -19119,7 +19118,7 @@ def list_conditions(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19128,7 +19127,7 @@ def list_conditions(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19252,7 +19251,7 @@ def list_customer_secret_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_customer_secret_keys got unknown kwargs: {extra_kwargs!r}") @@ -19283,7 +19282,7 @@ def list_customer_secret_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19292,7 +19291,7 @@ def list_customer_secret_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19416,7 +19415,7 @@ def list_dynamic_resource_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_dynamic_resource_groups got unknown kwargs: {extra_kwargs!r}") @@ -19447,7 +19446,7 @@ def list_dynamic_resource_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19456,7 +19455,7 @@ def list_dynamic_resource_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19580,7 +19579,7 @@ def list_grants(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_grants got unknown kwargs: {extra_kwargs!r}") @@ -19611,7 +19610,7 @@ def list_grants(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19620,7 +19619,7 @@ def list_grants(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19744,7 +19743,7 @@ def list_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_groups got unknown kwargs: {extra_kwargs!r}") @@ -19775,7 +19774,7 @@ def list_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19784,7 +19783,7 @@ def list_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19908,7 +19907,7 @@ def list_identity_propagation_trusts(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_identity_propagation_trusts got unknown kwargs: {extra_kwargs!r}") @@ -19939,7 +19938,7 @@ def list_identity_propagation_trusts(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -19948,7 +19947,7 @@ def list_identity_propagation_trusts(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20072,7 +20071,7 @@ def list_identity_providers(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_identity_providers got unknown kwargs: {extra_kwargs!r}") @@ -20103,7 +20102,7 @@ def list_identity_providers(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20112,7 +20111,7 @@ def list_identity_providers(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20212,7 +20211,7 @@ def list_identity_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_identity_settings got unknown kwargs: {extra_kwargs!r}") @@ -20231,7 +20230,7 @@ def list_identity_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20240,7 +20239,7 @@ def list_identity_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20340,7 +20339,7 @@ def list_kmsi_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_kmsi_settings got unknown kwargs: {extra_kwargs!r}") @@ -20359,7 +20358,7 @@ def list_kmsi_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20368,7 +20367,7 @@ def list_kmsi_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20482,7 +20481,7 @@ def list_my_api_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_api_keys got unknown kwargs: {extra_kwargs!r}") @@ -20503,7 +20502,7 @@ def list_my_api_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20512,7 +20511,7 @@ def list_my_api_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20626,7 +20625,7 @@ def list_my_apps(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_apps got unknown kwargs: {extra_kwargs!r}") @@ -20647,7 +20646,7 @@ def list_my_apps(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20656,7 +20655,7 @@ def list_my_apps(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20770,7 +20769,7 @@ def list_my_auth_tokens(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_auth_tokens got unknown kwargs: {extra_kwargs!r}") @@ -20791,7 +20790,7 @@ def list_my_auth_tokens(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20800,7 +20799,7 @@ def list_my_auth_tokens(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20914,7 +20913,7 @@ def list_my_completed_approvals(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_completed_approvals got unknown kwargs: {extra_kwargs!r}") @@ -20935,7 +20934,7 @@ def list_my_completed_approvals(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -20944,7 +20943,7 @@ def list_my_completed_approvals(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21058,7 +21057,7 @@ def list_my_customer_secret_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_customer_secret_keys got unknown kwargs: {extra_kwargs!r}") @@ -21079,7 +21078,7 @@ def list_my_customer_secret_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21088,7 +21087,7 @@ def list_my_customer_secret_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21212,7 +21211,7 @@ def list_my_devices(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_devices got unknown kwargs: {extra_kwargs!r}") @@ -21243,7 +21242,7 @@ def list_my_devices(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21252,7 +21251,7 @@ def list_my_devices(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21376,7 +21375,7 @@ def list_my_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_groups got unknown kwargs: {extra_kwargs!r}") @@ -21407,7 +21406,7 @@ def list_my_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21416,7 +21415,7 @@ def list_my_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21530,7 +21529,7 @@ def list_my_o_auth2_client_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_o_auth2_client_credentials got unknown kwargs: {extra_kwargs!r}") @@ -21551,7 +21550,7 @@ def list_my_o_auth2_client_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21560,7 +21559,7 @@ def list_my_o_auth2_client_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21674,7 +21673,7 @@ def list_my_pending_approvals(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_pending_approvals got unknown kwargs: {extra_kwargs!r}") @@ -21695,7 +21694,7 @@ def list_my_pending_approvals(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21704,7 +21703,7 @@ def list_my_pending_approvals(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21818,7 +21817,7 @@ def list_my_requestable_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_requestable_groups got unknown kwargs: {extra_kwargs!r}") @@ -21839,7 +21838,7 @@ def list_my_requestable_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -21848,7 +21847,7 @@ def list_my_requestable_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21972,7 +21971,7 @@ def list_my_requests(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_requests got unknown kwargs: {extra_kwargs!r}") @@ -22003,7 +22002,7 @@ def list_my_requests(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22012,7 +22011,7 @@ def list_my_requests(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22126,7 +22125,7 @@ def list_my_smtp_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_smtp_credentials got unknown kwargs: {extra_kwargs!r}") @@ -22147,7 +22146,7 @@ def list_my_smtp_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22156,7 +22155,7 @@ def list_my_smtp_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22270,7 +22269,7 @@ def list_my_support_accounts(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_support_accounts got unknown kwargs: {extra_kwargs!r}") @@ -22291,7 +22290,7 @@ def list_my_support_accounts(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22300,7 +22299,7 @@ def list_my_support_accounts(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22424,7 +22423,7 @@ def list_my_trusted_user_agents(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_trusted_user_agents got unknown kwargs: {extra_kwargs!r}") @@ -22455,7 +22454,7 @@ def list_my_trusted_user_agents(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22464,7 +22463,7 @@ def list_my_trusted_user_agents(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22578,7 +22577,7 @@ def list_my_user_db_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_my_user_db_credentials got unknown kwargs: {extra_kwargs!r}") @@ -22599,7 +22598,7 @@ def list_my_user_db_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22608,7 +22607,7 @@ def list_my_user_db_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22732,7 +22731,7 @@ def list_network_perimeters(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_perimeters got unknown kwargs: {extra_kwargs!r}") @@ -22763,7 +22762,7 @@ def list_network_perimeters(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22772,7 +22771,7 @@ def list_network_perimeters(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22872,7 +22871,7 @@ def list_notification_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_notification_settings got unknown kwargs: {extra_kwargs!r}") @@ -22891,7 +22890,7 @@ def list_notification_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -22900,7 +22899,7 @@ def list_notification_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23024,7 +23023,7 @@ def list_o_auth2_client_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_o_auth2_client_credentials got unknown kwargs: {extra_kwargs!r}") @@ -23055,7 +23054,7 @@ def list_o_auth2_client_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23064,7 +23063,7 @@ def list_o_auth2_client_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23178,7 +23177,7 @@ def list_o_auth_client_certificates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_o_auth_client_certificates got unknown kwargs: {extra_kwargs!r}") @@ -23199,7 +23198,7 @@ def list_o_auth_client_certificates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23208,7 +23207,7 @@ def list_o_auth_client_certificates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23322,7 +23321,7 @@ def list_o_auth_partner_certificates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_o_auth_partner_certificates got unknown kwargs: {extra_kwargs!r}") @@ -23343,7 +23342,7 @@ def list_o_auth_partner_certificates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23352,7 +23351,7 @@ def list_o_auth_partner_certificates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23476,7 +23475,7 @@ def list_password_policies(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_password_policies got unknown kwargs: {extra_kwargs!r}") @@ -23507,7 +23506,7 @@ def list_password_policies(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23516,7 +23515,7 @@ def list_password_policies(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23640,7 +23639,7 @@ def list_policies(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_policies got unknown kwargs: {extra_kwargs!r}") @@ -23671,7 +23670,7 @@ def list_policies(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23680,7 +23679,7 @@ def list_policies(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23804,7 +23803,7 @@ def list_resource_type_schema_attributes(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_type_schema_attributes got unknown kwargs: {extra_kwargs!r}") @@ -23835,7 +23834,7 @@ def list_resource_type_schema_attributes(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -23844,7 +23843,7 @@ def list_resource_type_schema_attributes(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23968,7 +23967,7 @@ def list_rules(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rules got unknown kwargs: {extra_kwargs!r}") @@ -23999,7 +23998,7 @@ def list_rules(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24008,7 +24007,7 @@ def list_rules(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24118,7 +24117,7 @@ def list_schemas(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_schemas got unknown kwargs: {extra_kwargs!r}") @@ -24138,7 +24137,7 @@ def list_schemas(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24147,7 +24146,7 @@ def list_schemas(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24247,7 +24246,7 @@ def list_security_question_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_question_settings got unknown kwargs: {extra_kwargs!r}") @@ -24266,7 +24265,7 @@ def list_security_question_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24275,7 +24274,7 @@ def list_security_question_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24399,7 +24398,7 @@ def list_security_questions(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_questions got unknown kwargs: {extra_kwargs!r}") @@ -24430,7 +24429,7 @@ def list_security_questions(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24439,7 +24438,7 @@ def list_security_questions(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24563,7 +24562,7 @@ def list_self_registration_profiles(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_self_registration_profiles got unknown kwargs: {extra_kwargs!r}") @@ -24594,7 +24593,7 @@ def list_self_registration_profiles(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24603,7 +24602,7 @@ def list_self_registration_profiles(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24703,7 +24702,7 @@ def list_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_settings got unknown kwargs: {extra_kwargs!r}") @@ -24722,7 +24721,7 @@ def list_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24731,7 +24730,7 @@ def list_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24855,7 +24854,7 @@ def list_smtp_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_smtp_credentials got unknown kwargs: {extra_kwargs!r}") @@ -24886,7 +24885,7 @@ def list_smtp_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -24895,7 +24894,7 @@ def list_smtp_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24995,7 +24994,7 @@ def list_user_attributes_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_attributes_settings got unknown kwargs: {extra_kwargs!r}") @@ -25014,7 +25013,7 @@ def list_user_attributes_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25023,7 +25022,7 @@ def list_user_attributes_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25147,7 +25146,7 @@ def list_user_db_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_user_db_credentials got unknown kwargs: {extra_kwargs!r}") @@ -25178,7 +25177,7 @@ def list_user_db_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25187,7 +25186,7 @@ def list_user_db_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25311,7 +25310,7 @@ def list_users(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_users got unknown kwargs: {extra_kwargs!r}") @@ -25342,7 +25341,7 @@ def list_users(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25351,7 +25350,7 @@ def list_users(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25466,7 +25465,7 @@ def patch_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_account_recovery_setting got unknown kwargs: {extra_kwargs!r}") @@ -25475,10 +25474,10 @@ def patch_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "accountRecoverySettingId": account_recovery_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -25493,7 +25492,7 @@ def patch_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25503,7 +25502,7 @@ def patch_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25622,7 +25621,7 @@ def patch_api_key(self, api_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_api_key got unknown kwargs: {extra_kwargs!r}") @@ -25631,10 +25630,10 @@ def patch_api_key(self, api_key_id, **kwargs): "apiKeyId": api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -25649,7 +25648,7 @@ def patch_api_key(self, api_key_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25659,7 +25658,7 @@ def patch_api_key(self, api_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25778,7 +25777,7 @@ def patch_app(self, app_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_app got unknown kwargs: {extra_kwargs!r}") @@ -25787,10 +25786,10 @@ def patch_app(self, app_id, **kwargs): "appId": app_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -25805,7 +25804,7 @@ def patch_app(self, app_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25815,7 +25814,7 @@ def patch_app(self, app_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25934,7 +25933,7 @@ def patch_app_role(self, app_role_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_app_role got unknown kwargs: {extra_kwargs!r}") @@ -25943,10 +25942,10 @@ def patch_app_role(self, app_role_id, **kwargs): "appRoleId": app_role_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -25961,7 +25960,7 @@ def patch_app_role(self, app_role_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -25971,7 +25970,7 @@ def patch_app_role(self, app_role_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26090,7 +26089,7 @@ def patch_approval_workflow(self, approval_workflow_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_approval_workflow got unknown kwargs: {extra_kwargs!r}") @@ -26099,10 +26098,10 @@ def patch_approval_workflow(self, approval_workflow_id, **kwargs): "approvalWorkflowId": approval_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26117,7 +26116,7 @@ def patch_approval_workflow(self, approval_workflow_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26127,7 +26126,7 @@ def patch_approval_workflow(self, approval_workflow_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26246,7 +26245,7 @@ def patch_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_approval_workflow_step got unknown kwargs: {extra_kwargs!r}") @@ -26255,10 +26254,10 @@ def patch_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "approvalWorkflowStepId": approval_workflow_step_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26273,7 +26272,7 @@ def patch_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26283,7 +26282,7 @@ def patch_approval_workflow_step(self, approval_workflow_step_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26402,7 +26401,7 @@ def patch_auth_token(self, auth_token_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -26411,10 +26410,10 @@ def patch_auth_token(self, auth_token_id, **kwargs): "authTokenId": auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26429,7 +26428,7 @@ def patch_auth_token(self, auth_token_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26439,7 +26438,7 @@ def patch_auth_token(self, auth_token_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26558,7 +26557,7 @@ def patch_cloud_gate(self, cloud_gate_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_cloud_gate got unknown kwargs: {extra_kwargs!r}") @@ -26567,10 +26566,10 @@ def patch_cloud_gate(self, cloud_gate_id, **kwargs): "cloudGateId": cloud_gate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26585,7 +26584,7 @@ def patch_cloud_gate(self, cloud_gate_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26595,7 +26594,7 @@ def patch_cloud_gate(self, cloud_gate_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26714,7 +26713,7 @@ def patch_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_cloud_gate_mapping got unknown kwargs: {extra_kwargs!r}") @@ -26723,10 +26722,10 @@ def patch_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "cloudGateMappingId": cloud_gate_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26741,7 +26740,7 @@ def patch_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26751,7 +26750,7 @@ def patch_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26870,7 +26869,7 @@ def patch_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_cloud_gate_server got unknown kwargs: {extra_kwargs!r}") @@ -26879,10 +26878,10 @@ def patch_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "cloudGateServerId": cloud_gate_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -26897,7 +26896,7 @@ def patch_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -26907,7 +26906,7 @@ def patch_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27026,7 +27025,7 @@ def patch_condition(self, condition_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_condition got unknown kwargs: {extra_kwargs!r}") @@ -27035,10 +27034,10 @@ def patch_condition(self, condition_id, **kwargs): "conditionId": condition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27053,7 +27052,7 @@ def patch_condition(self, condition_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27063,7 +27062,7 @@ def patch_condition(self, condition_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27182,7 +27181,7 @@ def patch_customer_secret_key(self, customer_secret_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -27191,10 +27190,10 @@ def patch_customer_secret_key(self, customer_secret_key_id, **kwargs): "customerSecretKeyId": customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27209,7 +27208,7 @@ def patch_customer_secret_key(self, customer_secret_key_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27219,7 +27218,7 @@ def patch_customer_secret_key(self, customer_secret_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27338,7 +27337,7 @@ def patch_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_dynamic_resource_group got unknown kwargs: {extra_kwargs!r}") @@ -27347,10 +27346,10 @@ def patch_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "dynamicResourceGroupId": dynamic_resource_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27365,7 +27364,7 @@ def patch_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27375,7 +27374,7 @@ def patch_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27494,7 +27493,7 @@ def patch_grant(self, grant_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_grant got unknown kwargs: {extra_kwargs!r}") @@ -27503,10 +27502,10 @@ def patch_grant(self, grant_id, **kwargs): "grantId": grant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27521,7 +27520,7 @@ def patch_grant(self, grant_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27531,7 +27530,7 @@ def patch_grant(self, grant_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27650,7 +27649,7 @@ def patch_group(self, group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_group got unknown kwargs: {extra_kwargs!r}") @@ -27659,10 +27658,10 @@ def patch_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27677,7 +27676,7 @@ def patch_group(self, group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27687,7 +27686,7 @@ def patch_group(self, group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27808,7 +27807,7 @@ def patch_identity_propagation_trust(self, identity_propagation_trust_id, **kwar "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_identity_propagation_trust got unknown kwargs: {extra_kwargs!r}") @@ -27817,10 +27816,10 @@ def patch_identity_propagation_trust(self, identity_propagation_trust_id, **kwar "identityPropagationTrustId": identity_propagation_trust_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27835,7 +27834,7 @@ def patch_identity_propagation_trust(self, identity_propagation_trust_id, **kwar "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -27845,7 +27844,7 @@ def patch_identity_propagation_trust(self, identity_propagation_trust_id, **kwar "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27964,7 +27963,7 @@ def patch_identity_provider(self, identity_provider_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -27973,10 +27972,10 @@ def patch_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -27991,7 +27990,7 @@ def patch_identity_provider(self, identity_provider_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -28001,7 +28000,7 @@ def patch_identity_provider(self, identity_provider_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28120,7 +28119,7 @@ def patch_identity_setting(self, identity_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_identity_setting got unknown kwargs: {extra_kwargs!r}") @@ -28129,10 +28128,10 @@ def patch_identity_setting(self, identity_setting_id, **kwargs): "identitySettingId": identity_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -28147,7 +28146,7 @@ def patch_identity_setting(self, identity_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -28157,7 +28156,7 @@ def patch_identity_setting(self, identity_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28276,7 +28275,7 @@ def patch_kmsi_setting(self, kmsi_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_kmsi_setting got unknown kwargs: {extra_kwargs!r}") @@ -28285,10 +28284,10 @@ def patch_kmsi_setting(self, kmsi_setting_id, **kwargs): "kmsiSettingId": kmsi_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -28303,7 +28302,7 @@ def patch_kmsi_setting(self, kmsi_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -28313,7 +28312,7 @@ def patch_kmsi_setting(self, kmsi_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28429,7 +28428,7 @@ def patch_me(self, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_me got unknown kwargs: {extra_kwargs!r}") @@ -28446,7 +28445,7 @@ def patch_me(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -28456,7 +28455,7 @@ def patch_me(self, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28563,7 +28562,7 @@ def patch_my_api_key(self, my_api_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_api_key got unknown kwargs: {extra_kwargs!r}") @@ -28572,10 +28571,10 @@ def patch_my_api_key(self, my_api_key_id, **kwargs): "myApiKeyId": my_api_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -28586,7 +28585,7 @@ def patch_my_api_key(self, my_api_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28693,7 +28692,7 @@ def patch_my_auth_token(self, my_auth_token_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_auth_token got unknown kwargs: {extra_kwargs!r}") @@ -28702,10 +28701,10 @@ def patch_my_auth_token(self, my_auth_token_id, **kwargs): "myAuthTokenId": my_auth_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -28716,7 +28715,7 @@ def patch_my_auth_token(self, my_auth_token_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28823,7 +28822,7 @@ def patch_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_customer_secret_key got unknown kwargs: {extra_kwargs!r}") @@ -28832,10 +28831,10 @@ def patch_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "myCustomerSecretKeyId": my_customer_secret_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -28846,7 +28845,7 @@ def patch_my_customer_secret_key(self, my_customer_secret_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28963,7 +28962,7 @@ def patch_my_device(self, my_device_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_device got unknown kwargs: {extra_kwargs!r}") @@ -28972,10 +28971,10 @@ def patch_my_device(self, my_device_id, **kwargs): "myDeviceId": my_device_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -28990,7 +28989,7 @@ def patch_my_device(self, my_device_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -29000,7 +28999,7 @@ def patch_my_device(self, my_device_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29109,7 +29108,7 @@ def patch_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, ** "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -29118,10 +29117,10 @@ def patch_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, ** "myOAuth2ClientCredentialId": my_o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29132,7 +29131,7 @@ def patch_my_o_auth2_client_credential(self, my_o_auth2_client_credential_id, ** "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29239,7 +29238,7 @@ def patch_my_pending_approval(self, my_pending_approval_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_pending_approval got unknown kwargs: {extra_kwargs!r}") @@ -29248,10 +29247,10 @@ def patch_my_pending_approval(self, my_pending_approval_id, **kwargs): "myPendingApprovalId": my_pending_approval_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29262,7 +29261,7 @@ def patch_my_pending_approval(self, my_pending_approval_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29379,7 +29378,7 @@ def patch_my_request(self, my_request_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_request got unknown kwargs: {extra_kwargs!r}") @@ -29388,10 +29387,10 @@ def patch_my_request(self, my_request_id, **kwargs): "myRequestId": my_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -29406,7 +29405,7 @@ def patch_my_request(self, my_request_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -29416,7 +29415,7 @@ def patch_my_request(self, my_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29525,7 +29524,7 @@ def patch_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_my_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -29534,10 +29533,10 @@ def patch_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "mySmtpCredentialId": my_smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29548,7 +29547,7 @@ def patch_my_smtp_credential(self, my_smtp_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29665,7 +29664,7 @@ def patch_network_perimeter(self, network_perimeter_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_network_perimeter got unknown kwargs: {extra_kwargs!r}") @@ -29674,10 +29673,10 @@ def patch_network_perimeter(self, network_perimeter_id, **kwargs): "networkPerimeterId": network_perimeter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -29692,7 +29691,7 @@ def patch_network_perimeter(self, network_perimeter_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -29702,7 +29701,7 @@ def patch_network_perimeter(self, network_perimeter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29821,7 +29820,7 @@ def patch_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_o_auth2_client_credential got unknown kwargs: {extra_kwargs!r}") @@ -29830,10 +29829,10 @@ def patch_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs "oAuth2ClientCredentialId": o_auth2_client_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -29848,7 +29847,7 @@ def patch_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -29858,7 +29857,7 @@ def patch_o_auth2_client_credential(self, o_auth2_client_credential_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29977,7 +29976,7 @@ def patch_password_policy(self, password_policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_password_policy got unknown kwargs: {extra_kwargs!r}") @@ -29986,10 +29985,10 @@ def patch_password_policy(self, password_policy_id, **kwargs): "passwordPolicyId": password_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30004,7 +30003,7 @@ def patch_password_policy(self, password_policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30014,7 +30013,7 @@ def patch_password_policy(self, password_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30133,7 +30132,7 @@ def patch_policy(self, policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_policy got unknown kwargs: {extra_kwargs!r}") @@ -30142,10 +30141,10 @@ def patch_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30160,7 +30159,7 @@ def patch_policy(self, policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30170,7 +30169,7 @@ def patch_policy(self, policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30289,7 +30288,7 @@ def patch_rule(self, rule_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_rule got unknown kwargs: {extra_kwargs!r}") @@ -30298,10 +30297,10 @@ def patch_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30316,7 +30315,7 @@ def patch_rule(self, rule_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30326,7 +30325,7 @@ def patch_rule(self, rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30435,7 +30434,7 @@ def patch_schema(self, schema_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_schema got unknown kwargs: {extra_kwargs!r}") @@ -30444,10 +30443,10 @@ def patch_schema(self, schema_id, **kwargs): "schemaId": schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -30458,7 +30457,7 @@ def patch_schema(self, schema_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30575,7 +30574,7 @@ def patch_security_question(self, security_question_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_security_question got unknown kwargs: {extra_kwargs!r}") @@ -30584,10 +30583,10 @@ def patch_security_question(self, security_question_id, **kwargs): "securityQuestionId": security_question_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30602,7 +30601,7 @@ def patch_security_question(self, security_question_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30612,7 +30611,7 @@ def patch_security_question(self, security_question_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30731,7 +30730,7 @@ def patch_security_question_setting(self, security_question_setting_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_security_question_setting got unknown kwargs: {extra_kwargs!r}") @@ -30740,10 +30739,10 @@ def patch_security_question_setting(self, security_question_setting_id, **kwargs "securityQuestionSettingId": security_question_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30758,7 +30757,7 @@ def patch_security_question_setting(self, security_question_setting_id, **kwargs "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30768,7 +30767,7 @@ def patch_security_question_setting(self, security_question_setting_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -30887,7 +30886,7 @@ def patch_self_registration_profile(self, self_registration_profile_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_self_registration_profile got unknown kwargs: {extra_kwargs!r}") @@ -30896,10 +30895,10 @@ def patch_self_registration_profile(self, self_registration_profile_id, **kwargs "selfRegistrationProfileId": self_registration_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -30914,7 +30913,7 @@ def patch_self_registration_profile(self, self_registration_profile_id, **kwargs "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -30924,7 +30923,7 @@ def patch_self_registration_profile(self, self_registration_profile_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31043,7 +31042,7 @@ def patch_setting(self, setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_setting got unknown kwargs: {extra_kwargs!r}") @@ -31052,10 +31051,10 @@ def patch_setting(self, setting_id, **kwargs): "settingId": setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31070,7 +31069,7 @@ def patch_setting(self, setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31080,7 +31079,7 @@ def patch_setting(self, setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31199,7 +31198,7 @@ def patch_smtp_credential(self, smtp_credential_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_smtp_credential got unknown kwargs: {extra_kwargs!r}") @@ -31208,10 +31207,10 @@ def patch_smtp_credential(self, smtp_credential_id, **kwargs): "smtpCredentialId": smtp_credential_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31226,7 +31225,7 @@ def patch_smtp_credential(self, smtp_credential_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31236,7 +31235,7 @@ def patch_smtp_credential(self, smtp_credential_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31355,7 +31354,7 @@ def patch_user(self, user_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_user got unknown kwargs: {extra_kwargs!r}") @@ -31364,10 +31363,10 @@ def patch_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31382,7 +31381,7 @@ def patch_user(self, user_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31392,7 +31391,7 @@ def patch_user(self, user_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31511,7 +31510,7 @@ def patch_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_user_attributes_setting got unknown kwargs: {extra_kwargs!r}") @@ -31520,10 +31519,10 @@ def patch_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "userAttributesSettingId": user_attributes_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31538,7 +31537,7 @@ def patch_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31548,7 +31547,7 @@ def patch_user_attributes_setting(self, user_attributes_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31667,7 +31666,7 @@ def put_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_account_recovery_setting got unknown kwargs: {extra_kwargs!r}") @@ -31676,10 +31675,10 @@ def put_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "accountRecoverySettingId": account_recovery_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31694,7 +31693,7 @@ def put_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31704,7 +31703,7 @@ def put_account_recovery_setting(self, account_recovery_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31823,7 +31822,7 @@ def put_app(self, app_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_app got unknown kwargs: {extra_kwargs!r}") @@ -31832,10 +31831,10 @@ def put_app(self, app_id, **kwargs): "appId": app_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -31850,7 +31849,7 @@ def put_app(self, app_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -31860,7 +31859,7 @@ def put_app(self, app_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31979,7 +31978,7 @@ def put_app_status_changer(self, app_status_changer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_app_status_changer got unknown kwargs: {extra_kwargs!r}") @@ -31988,10 +31987,10 @@ def put_app_status_changer(self, app_status_changer_id, **kwargs): "appStatusChangerId": app_status_changer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32006,7 +32005,7 @@ def put_app_status_changer(self, app_status_changer_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32016,7 +32015,7 @@ def put_app_status_changer(self, app_status_changer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32135,7 +32134,7 @@ def put_approval_workflow(self, approval_workflow_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_approval_workflow got unknown kwargs: {extra_kwargs!r}") @@ -32144,10 +32143,10 @@ def put_approval_workflow(self, approval_workflow_id, **kwargs): "approvalWorkflowId": approval_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32162,7 +32161,7 @@ def put_approval_workflow(self, approval_workflow_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32172,7 +32171,7 @@ def put_approval_workflow(self, approval_workflow_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32291,7 +32290,7 @@ def put_authentication_factor_setting(self, authentication_factor_setting_id, ** "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_authentication_factor_setting got unknown kwargs: {extra_kwargs!r}") @@ -32300,10 +32299,10 @@ def put_authentication_factor_setting(self, authentication_factor_setting_id, ** "authenticationFactorSettingId": authentication_factor_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32318,7 +32317,7 @@ def put_authentication_factor_setting(self, authentication_factor_setting_id, ** "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32328,7 +32327,7 @@ def put_authentication_factor_setting(self, authentication_factor_setting_id, ** "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32447,7 +32446,7 @@ def put_cloud_gate(self, cloud_gate_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_cloud_gate got unknown kwargs: {extra_kwargs!r}") @@ -32456,10 +32455,10 @@ def put_cloud_gate(self, cloud_gate_id, **kwargs): "cloudGateId": cloud_gate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32474,7 +32473,7 @@ def put_cloud_gate(self, cloud_gate_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32484,7 +32483,7 @@ def put_cloud_gate(self, cloud_gate_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32603,7 +32602,7 @@ def put_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_cloud_gate_mapping got unknown kwargs: {extra_kwargs!r}") @@ -32612,10 +32611,10 @@ def put_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "cloudGateMappingId": cloud_gate_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32630,7 +32629,7 @@ def put_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32640,7 +32639,7 @@ def put_cloud_gate_mapping(self, cloud_gate_mapping_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32759,7 +32758,7 @@ def put_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_cloud_gate_server got unknown kwargs: {extra_kwargs!r}") @@ -32768,10 +32767,10 @@ def put_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "cloudGateServerId": cloud_gate_server_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32786,7 +32785,7 @@ def put_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32796,7 +32795,7 @@ def put_cloud_gate_server(self, cloud_gate_server_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32915,7 +32914,7 @@ def put_condition(self, condition_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_condition got unknown kwargs: {extra_kwargs!r}") @@ -32924,10 +32923,10 @@ def put_condition(self, condition_id, **kwargs): "conditionId": condition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -32942,7 +32941,7 @@ def put_condition(self, condition_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -32952,7 +32951,7 @@ def put_condition(self, condition_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33071,7 +33070,7 @@ def put_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_dynamic_resource_group got unknown kwargs: {extra_kwargs!r}") @@ -33080,10 +33079,10 @@ def put_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "dynamicResourceGroupId": dynamic_resource_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33098,7 +33097,7 @@ def put_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33108,7 +33107,7 @@ def put_dynamic_resource_group(self, dynamic_resource_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33227,7 +33226,7 @@ def put_group(self, group_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_group got unknown kwargs: {extra_kwargs!r}") @@ -33236,10 +33235,10 @@ def put_group(self, group_id, **kwargs): "groupId": group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33254,7 +33253,7 @@ def put_group(self, group_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33264,7 +33263,7 @@ def put_group(self, group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33385,7 +33384,7 @@ def put_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_identity_propagation_trust got unknown kwargs: {extra_kwargs!r}") @@ -33394,10 +33393,10 @@ def put_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "identityPropagationTrustId": identity_propagation_trust_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33412,7 +33411,7 @@ def put_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33422,7 +33421,7 @@ def put_identity_propagation_trust(self, identity_propagation_trust_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33541,7 +33540,7 @@ def put_identity_provider(self, identity_provider_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -33550,10 +33549,10 @@ def put_identity_provider(self, identity_provider_id, **kwargs): "identityProviderId": identity_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33568,7 +33567,7 @@ def put_identity_provider(self, identity_provider_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33578,7 +33577,7 @@ def put_identity_provider(self, identity_provider_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33697,7 +33696,7 @@ def put_identity_setting(self, identity_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_identity_setting got unknown kwargs: {extra_kwargs!r}") @@ -33706,10 +33705,10 @@ def put_identity_setting(self, identity_setting_id, **kwargs): "identitySettingId": identity_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33724,7 +33723,7 @@ def put_identity_setting(self, identity_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33734,7 +33733,7 @@ def put_identity_setting(self, identity_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -33853,7 +33852,7 @@ def put_kmsi_setting(self, kmsi_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_kmsi_setting got unknown kwargs: {extra_kwargs!r}") @@ -33862,10 +33861,10 @@ def put_kmsi_setting(self, kmsi_setting_id, **kwargs): "kmsiSettingId": kmsi_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -33880,7 +33879,7 @@ def put_kmsi_setting(self, kmsi_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -33890,7 +33889,7 @@ def put_kmsi_setting(self, kmsi_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34006,7 +34005,7 @@ def put_me(self, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_me got unknown kwargs: {extra_kwargs!r}") @@ -34023,7 +34022,7 @@ def put_me(self, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34033,7 +34032,7 @@ def put_me(self, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34137,7 +34136,7 @@ def put_me_password_changer(self, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_me_password_changer got unknown kwargs: {extra_kwargs!r}") @@ -34150,7 +34149,7 @@ def put_me_password_changer(self, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34265,7 +34264,7 @@ def put_network_perimeter(self, network_perimeter_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_network_perimeter got unknown kwargs: {extra_kwargs!r}") @@ -34274,10 +34273,10 @@ def put_network_perimeter(self, network_perimeter_id, **kwargs): "networkPerimeterId": network_perimeter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -34292,7 +34291,7 @@ def put_network_perimeter(self, network_perimeter_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34302,7 +34301,7 @@ def put_network_perimeter(self, network_perimeter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34421,7 +34420,7 @@ def put_notification_setting(self, notification_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_notification_setting got unknown kwargs: {extra_kwargs!r}") @@ -34430,10 +34429,10 @@ def put_notification_setting(self, notification_setting_id, **kwargs): "notificationSettingId": notification_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -34448,7 +34447,7 @@ def put_notification_setting(self, notification_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34458,7 +34457,7 @@ def put_notification_setting(self, notification_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34577,7 +34576,7 @@ def put_password_policy(self, password_policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_password_policy got unknown kwargs: {extra_kwargs!r}") @@ -34586,10 +34585,10 @@ def put_password_policy(self, password_policy_id, **kwargs): "passwordPolicyId": password_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -34604,7 +34603,7 @@ def put_password_policy(self, password_policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34614,7 +34613,7 @@ def put_password_policy(self, password_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34733,7 +34732,7 @@ def put_policy(self, policy_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_policy got unknown kwargs: {extra_kwargs!r}") @@ -34742,10 +34741,10 @@ def put_policy(self, policy_id, **kwargs): "policyId": policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -34760,7 +34759,7 @@ def put_policy(self, policy_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34770,7 +34769,7 @@ def put_policy(self, policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34889,7 +34888,7 @@ def put_rule(self, rule_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_rule got unknown kwargs: {extra_kwargs!r}") @@ -34898,10 +34897,10 @@ def put_rule(self, rule_id, **kwargs): "ruleId": rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -34916,7 +34915,7 @@ def put_rule(self, rule_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -34926,7 +34925,7 @@ def put_rule(self, rule_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35035,7 +35034,7 @@ def put_schema(self, schema_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_schema got unknown kwargs: {extra_kwargs!r}") @@ -35044,10 +35043,10 @@ def put_schema(self, schema_id, **kwargs): "schemaId": schema_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35058,7 +35057,7 @@ def put_schema(self, schema_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35175,7 +35174,7 @@ def put_security_question_setting(self, security_question_setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_security_question_setting got unknown kwargs: {extra_kwargs!r}") @@ -35184,10 +35183,10 @@ def put_security_question_setting(self, security_question_setting_id, **kwargs): "securityQuestionSettingId": security_question_setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -35202,7 +35201,7 @@ def put_security_question_setting(self, security_question_setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -35212,7 +35211,7 @@ def put_security_question_setting(self, security_question_setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35331,7 +35330,7 @@ def put_self_registration_profile(self, self_registration_profile_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_self_registration_profile got unknown kwargs: {extra_kwargs!r}") @@ -35340,10 +35339,10 @@ def put_self_registration_profile(self, self_registration_profile_id, **kwargs): "selfRegistrationProfileId": self_registration_profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -35358,7 +35357,7 @@ def put_self_registration_profile(self, self_registration_profile_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -35368,7 +35367,7 @@ def put_self_registration_profile(self, self_registration_profile_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35487,7 +35486,7 @@ def put_setting(self, setting_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_setting got unknown kwargs: {extra_kwargs!r}") @@ -35496,10 +35495,10 @@ def put_setting(self, setting_id, **kwargs): "settingId": setting_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -35514,7 +35513,7 @@ def put_setting(self, setting_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -35524,7 +35523,7 @@ def put_setting(self, setting_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35643,7 +35642,7 @@ def put_user(self, user_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_user got unknown kwargs: {extra_kwargs!r}") @@ -35652,10 +35651,10 @@ def put_user(self, user_id, **kwargs): "userId": user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -35670,7 +35669,7 @@ def put_user(self, user_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -35680,7 +35679,7 @@ def put_user(self, user_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35789,7 +35788,7 @@ def put_user_capabilities_changer(self, user_capabilities_changer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_user_capabilities_changer got unknown kwargs: {extra_kwargs!r}") @@ -35798,10 +35797,10 @@ def put_user_capabilities_changer(self, user_capabilities_changer_id, **kwargs): "userCapabilitiesChangerId": user_capabilities_changer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35812,7 +35811,7 @@ def put_user_capabilities_changer(self, user_capabilities_changer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -35919,7 +35918,7 @@ def put_user_password_changer(self, user_password_changer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_user_password_changer got unknown kwargs: {extra_kwargs!r}") @@ -35928,10 +35927,10 @@ def put_user_password_changer(self, user_password_changer_id, **kwargs): "userPasswordChangerId": user_password_changer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -35942,7 +35941,7 @@ def put_user_password_changer(self, user_password_changer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36049,7 +36048,7 @@ def put_user_password_resetter(self, user_password_resetter_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_user_password_resetter got unknown kwargs: {extra_kwargs!r}") @@ -36058,10 +36057,10 @@ def put_user_password_resetter(self, user_password_resetter_id, **kwargs): "userPasswordResetterId": user_password_resetter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -36072,7 +36071,7 @@ def put_user_password_resetter(self, user_password_resetter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36189,7 +36188,7 @@ def put_user_status_changer(self, user_status_changer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_user_status_changer got unknown kwargs: {extra_kwargs!r}") @@ -36198,10 +36197,10 @@ def put_user_status_changer(self, user_status_changer_id, **kwargs): "userStatusChangerId": user_status_changer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'attribute_sets' in kwargs: @@ -36216,7 +36215,7 @@ def put_user_status_changer(self, user_status_changer_id, **kwargs): "attributes": kwargs.get("attributes", missing), "attributeSets": self.base_client.generate_collection_format_param(kwargs.get("attribute_sets", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36226,7 +36225,7 @@ def put_user_status_changer(self, user_status_changer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36324,7 +36323,7 @@ def search_account_mgmt_infos(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_account_mgmt_infos got unknown kwargs: {extra_kwargs!r}") @@ -36333,7 +36332,7 @@ def search_account_mgmt_infos(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36342,7 +36341,7 @@ def search_account_mgmt_infos(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36438,7 +36437,7 @@ def search_api_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_api_keys got unknown kwargs: {extra_kwargs!r}") @@ -36447,7 +36446,7 @@ def search_api_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36456,7 +36455,7 @@ def search_api_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36552,7 +36551,7 @@ def search_app_roles(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_app_roles got unknown kwargs: {extra_kwargs!r}") @@ -36561,7 +36560,7 @@ def search_app_roles(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36570,7 +36569,7 @@ def search_app_roles(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36666,7 +36665,7 @@ def search_apps(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_apps got unknown kwargs: {extra_kwargs!r}") @@ -36675,7 +36674,7 @@ def search_apps(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36684,7 +36683,7 @@ def search_apps(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36780,7 +36779,7 @@ def search_auth_tokens(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_auth_tokens got unknown kwargs: {extra_kwargs!r}") @@ -36789,7 +36788,7 @@ def search_auth_tokens(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36798,7 +36797,7 @@ def search_auth_tokens(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -36894,7 +36893,7 @@ def search_authentication_factor_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_authentication_factor_settings got unknown kwargs: {extra_kwargs!r}") @@ -36903,7 +36902,7 @@ def search_authentication_factor_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -36912,7 +36911,7 @@ def search_authentication_factor_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37008,7 +37007,7 @@ def search_cloud_gate_mappings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_cloud_gate_mappings got unknown kwargs: {extra_kwargs!r}") @@ -37017,7 +37016,7 @@ def search_cloud_gate_mappings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37026,7 +37025,7 @@ def search_cloud_gate_mappings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37122,7 +37121,7 @@ def search_cloud_gate_servers(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_cloud_gate_servers got unknown kwargs: {extra_kwargs!r}") @@ -37131,7 +37130,7 @@ def search_cloud_gate_servers(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37140,7 +37139,7 @@ def search_cloud_gate_servers(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37236,7 +37235,7 @@ def search_cloud_gates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_cloud_gates got unknown kwargs: {extra_kwargs!r}") @@ -37245,7 +37244,7 @@ def search_cloud_gates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37254,7 +37253,7 @@ def search_cloud_gates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37350,7 +37349,7 @@ def search_conditions(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_conditions got unknown kwargs: {extra_kwargs!r}") @@ -37359,7 +37358,7 @@ def search_conditions(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37368,7 +37367,7 @@ def search_conditions(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37464,7 +37463,7 @@ def search_customer_secret_keys(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_customer_secret_keys got unknown kwargs: {extra_kwargs!r}") @@ -37473,7 +37472,7 @@ def search_customer_secret_keys(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37482,7 +37481,7 @@ def search_customer_secret_keys(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37578,7 +37577,7 @@ def search_dynamic_resource_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_dynamic_resource_groups got unknown kwargs: {extra_kwargs!r}") @@ -37587,7 +37586,7 @@ def search_dynamic_resource_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37596,7 +37595,7 @@ def search_dynamic_resource_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37692,7 +37691,7 @@ def search_grants(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_grants got unknown kwargs: {extra_kwargs!r}") @@ -37701,7 +37700,7 @@ def search_grants(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37710,7 +37709,7 @@ def search_grants(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37806,7 +37805,7 @@ def search_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_groups got unknown kwargs: {extra_kwargs!r}") @@ -37815,7 +37814,7 @@ def search_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37824,7 +37823,7 @@ def search_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37920,7 +37919,7 @@ def search_identity_providers(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_identity_providers got unknown kwargs: {extra_kwargs!r}") @@ -37929,7 +37928,7 @@ def search_identity_providers(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -37938,7 +37937,7 @@ def search_identity_providers(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38034,7 +38033,7 @@ def search_identity_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_identity_settings got unknown kwargs: {extra_kwargs!r}") @@ -38043,7 +38042,7 @@ def search_identity_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38052,7 +38051,7 @@ def search_identity_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38148,7 +38147,7 @@ def search_kmsi_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_kmsi_settings got unknown kwargs: {extra_kwargs!r}") @@ -38157,7 +38156,7 @@ def search_kmsi_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38166,7 +38165,7 @@ def search_kmsi_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38262,7 +38261,7 @@ def search_my_apps(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_my_apps got unknown kwargs: {extra_kwargs!r}") @@ -38271,7 +38270,7 @@ def search_my_apps(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38280,7 +38279,7 @@ def search_my_apps(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38376,7 +38375,7 @@ def search_my_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_my_groups got unknown kwargs: {extra_kwargs!r}") @@ -38385,7 +38384,7 @@ def search_my_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38394,7 +38393,7 @@ def search_my_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38490,7 +38489,7 @@ def search_my_requestable_groups(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_my_requestable_groups got unknown kwargs: {extra_kwargs!r}") @@ -38499,7 +38498,7 @@ def search_my_requestable_groups(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38508,7 +38507,7 @@ def search_my_requestable_groups(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38604,7 +38603,7 @@ def search_my_requests(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_my_requests got unknown kwargs: {extra_kwargs!r}") @@ -38613,7 +38612,7 @@ def search_my_requests(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38622,7 +38621,7 @@ def search_my_requests(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38718,7 +38717,7 @@ def search_network_perimeters(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_network_perimeters got unknown kwargs: {extra_kwargs!r}") @@ -38727,7 +38726,7 @@ def search_network_perimeters(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38736,7 +38735,7 @@ def search_network_perimeters(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38832,7 +38831,7 @@ def search_notification_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_notification_settings got unknown kwargs: {extra_kwargs!r}") @@ -38841,7 +38840,7 @@ def search_notification_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38850,7 +38849,7 @@ def search_notification_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -38946,7 +38945,7 @@ def search_o_auth2_client_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_o_auth2_client_credentials got unknown kwargs: {extra_kwargs!r}") @@ -38955,7 +38954,7 @@ def search_o_auth2_client_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -38964,7 +38963,7 @@ def search_o_auth2_client_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39060,7 +39059,7 @@ def search_o_auth_client_certificates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_o_auth_client_certificates got unknown kwargs: {extra_kwargs!r}") @@ -39069,7 +39068,7 @@ def search_o_auth_client_certificates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39078,7 +39077,7 @@ def search_o_auth_client_certificates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39174,7 +39173,7 @@ def search_o_auth_partner_certificates(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_o_auth_partner_certificates got unknown kwargs: {extra_kwargs!r}") @@ -39183,7 +39182,7 @@ def search_o_auth_partner_certificates(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39192,7 +39191,7 @@ def search_o_auth_partner_certificates(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39288,7 +39287,7 @@ def search_password_policies(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_password_policies got unknown kwargs: {extra_kwargs!r}") @@ -39297,7 +39296,7 @@ def search_password_policies(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39306,7 +39305,7 @@ def search_password_policies(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39402,7 +39401,7 @@ def search_policies(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_policies got unknown kwargs: {extra_kwargs!r}") @@ -39411,7 +39410,7 @@ def search_policies(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39420,7 +39419,7 @@ def search_policies(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39516,7 +39515,7 @@ def search_resource_type_schema_attributes(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_resource_type_schema_attributes got unknown kwargs: {extra_kwargs!r}") @@ -39525,7 +39524,7 @@ def search_resource_type_schema_attributes(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39534,7 +39533,7 @@ def search_resource_type_schema_attributes(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39630,7 +39629,7 @@ def search_rules(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_rules got unknown kwargs: {extra_kwargs!r}") @@ -39639,7 +39638,7 @@ def search_rules(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39648,7 +39647,7 @@ def search_rules(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39744,7 +39743,7 @@ def search_schemas(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_schemas got unknown kwargs: {extra_kwargs!r}") @@ -39753,7 +39752,7 @@ def search_schemas(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39762,7 +39761,7 @@ def search_schemas(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39858,7 +39857,7 @@ def search_security_question_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_security_question_settings got unknown kwargs: {extra_kwargs!r}") @@ -39867,7 +39866,7 @@ def search_security_question_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39876,7 +39875,7 @@ def search_security_question_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39972,7 +39971,7 @@ def search_security_questions(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_security_questions got unknown kwargs: {extra_kwargs!r}") @@ -39981,7 +39980,7 @@ def search_security_questions(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -39990,7 +39989,7 @@ def search_security_questions(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40086,7 +40085,7 @@ def search_self_registration_profiles(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_self_registration_profiles got unknown kwargs: {extra_kwargs!r}") @@ -40095,7 +40094,7 @@ def search_self_registration_profiles(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40104,7 +40103,7 @@ def search_self_registration_profiles(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40200,7 +40199,7 @@ def search_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_settings got unknown kwargs: {extra_kwargs!r}") @@ -40209,7 +40208,7 @@ def search_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40218,7 +40217,7 @@ def search_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40314,7 +40313,7 @@ def search_smtp_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_smtp_credentials got unknown kwargs: {extra_kwargs!r}") @@ -40323,7 +40322,7 @@ def search_smtp_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40332,7 +40331,7 @@ def search_smtp_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40428,7 +40427,7 @@ def search_user_attributes_settings(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_user_attributes_settings got unknown kwargs: {extra_kwargs!r}") @@ -40437,7 +40436,7 @@ def search_user_attributes_settings(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40446,7 +40445,7 @@ def search_user_attributes_settings(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40542,7 +40541,7 @@ def search_user_db_credentials(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_user_db_credentials got unknown kwargs: {extra_kwargs!r}") @@ -40551,7 +40550,7 @@ def search_user_db_credentials(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40560,7 +40559,7 @@ def search_user_db_credentials(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40656,7 +40655,7 @@ def search_users(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_users got unknown kwargs: {extra_kwargs!r}") @@ -40665,7 +40664,7 @@ def search_users(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json, application/scim+json", @@ -40674,7 +40673,7 @@ def search_users(self, **kwargs): "resource_type_schema_version": kwargs.get("resource_type_schema_version", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/integration/integration_instance_client.py b/src/oci/integration/integration_instance_client.py index d781ac5460..09daae2640 100644 --- a/src/oci/integration/integration_instance_client.py +++ b/src/oci/integration/integration_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def change_integration_instance_compartment(self, integration_instance_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_integration_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def change_integration_instance_compartment(self, integration_instance_id, chang "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def change_integration_instance_compartment(self, integration_instance_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -298,7 +297,7 @@ def change_integration_instance_network_endpoint(self, integration_instance_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_integration_instance_network_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -307,10 +306,10 @@ def change_integration_instance_network_endpoint(self, integration_instance_id, "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -320,7 +319,7 @@ def change_integration_instance_network_endpoint(self, integration_instance_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -418,7 +417,7 @@ def change_private_endpoint_outbound_connection(self, integration_instance_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_private_endpoint_outbound_connection got unknown kwargs: {extra_kwargs!r}") @@ -427,10 +426,10 @@ def change_private_endpoint_outbound_connection(self, integration_instance_id, c "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -440,7 +439,7 @@ def change_private_endpoint_outbound_connection(self, integration_instance_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -526,7 +525,7 @@ def create_integration_instance(self, create_integration_instance_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -537,7 +536,7 @@ def create_integration_instance(self, create_integration_instance_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -622,7 +621,7 @@ def delete_integration_instance(self, integration_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -631,10 +630,10 @@ def delete_integration_instance(self, integration_instance_id, **kwargs): "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -643,7 +642,7 @@ def delete_integration_instance(self, integration_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -734,7 +733,7 @@ def enable_process_automation(self, integration_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_process_automation got unknown kwargs: {extra_kwargs!r}") @@ -743,10 +742,10 @@ def enable_process_automation(self, integration_instance_id, **kwargs): "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -756,7 +755,7 @@ def enable_process_automation(self, integration_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -831,7 +830,7 @@ def get_integration_instance(self, integration_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -840,10 +839,10 @@ def get_integration_instance(self, integration_instance_id, **kwargs): "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -851,7 +850,7 @@ def get_integration_instance(self, integration_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -927,7 +926,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -936,10 +935,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -947,7 +946,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1057,7 +1056,7 @@ def list_integration_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_integration_instances got unknown kwargs: {extra_kwargs!r}") @@ -1092,14 +1091,14 @@ def list_integration_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1186,7 +1185,7 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1195,10 +1194,10 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1206,14 +1205,14 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1302,7 +1301,7 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1311,10 +1310,10 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1322,14 +1321,14 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1419,7 +1418,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "integration_instance_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1430,14 +1429,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "integrationInstanceId": kwargs.get("integration_instance_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1530,7 +1529,7 @@ def start_integration_instance(self, integration_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -1539,10 +1538,10 @@ def start_integration_instance(self, integration_instance_id, **kwargs): "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1552,7 +1551,7 @@ def start_integration_instance(self, integration_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1644,7 +1643,7 @@ def stop_integration_instance(self, integration_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -1653,10 +1652,10 @@ def stop_integration_instance(self, integration_instance_id, **kwargs): "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1666,7 +1665,7 @@ def stop_integration_instance(self, integration_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1752,7 +1751,7 @@ def update_integration_instance(self, integration_instance_id, update_integratio "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_integration_instance got unknown kwargs: {extra_kwargs!r}") @@ -1761,10 +1760,10 @@ def update_integration_instance(self, integration_instance_id, update_integratio "integrationInstanceId": integration_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1773,7 +1772,7 @@ def update_integration_instance(self, integration_instance_id, update_integratio "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/jms/java_management_service_client.py b/src/oci/jms/java_management_service_client.py index 64a02d4d62..1932bd35f7 100644 --- a/src/oci/jms/java_management_service_client.py +++ b/src/oci/jms/java_management_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def add_fleet_installation_sites(self, fleet_id, add_fleet_installation_sites_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_fleet_installation_sites got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def add_fleet_installation_sites(self, fleet_id, add_fleet_installation_sites_de "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def add_fleet_installation_sites(self, fleet_id, add_fleet_installation_sites_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -290,7 +289,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -299,10 +298,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -311,7 +310,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -408,7 +407,7 @@ def change_fleet_compartment(self, fleet_id, change_fleet_compartment_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_fleet_compartment got unknown kwargs: {extra_kwargs!r}") @@ -417,10 +416,10 @@ def change_fleet_compartment(self, fleet_id, change_fleet_compartment_details, * "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -430,7 +429,7 @@ def change_fleet_compartment(self, fleet_id, change_fleet_compartment_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -522,7 +521,7 @@ def create_blocklist(self, fleet_id, create_blocklist_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_blocklist got unknown kwargs: {extra_kwargs!r}") @@ -531,10 +530,10 @@ def create_blocklist(self, fleet_id, create_blocklist_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -543,7 +542,7 @@ def create_blocklist(self, fleet_id, create_blocklist_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -645,7 +644,7 @@ def create_drs_file(self, fleet_id, create_drs_file_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_drs_file got unknown kwargs: {extra_kwargs!r}") @@ -654,10 +653,10 @@ def create_drs_file(self, fleet_id, create_drs_file_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -667,7 +666,7 @@ def create_drs_file(self, fleet_id, create_drs_file_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def create_fleet(self, create_fleet_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_fleet got unknown kwargs: {extra_kwargs!r}") @@ -773,7 +772,7 @@ def create_fleet(self, create_fleet_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -863,7 +862,7 @@ def delete_blocklist(self, fleet_id, blocklist_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_blocklist got unknown kwargs: {extra_kwargs!r}") @@ -873,10 +872,10 @@ def delete_blocklist(self, fleet_id, blocklist_key, **kwargs): "blocklistKey": blocklist_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -885,7 +884,7 @@ def delete_blocklist(self, fleet_id, blocklist_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -974,7 +973,7 @@ def delete_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_crypto_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -984,10 +983,10 @@ def delete_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **k "cryptoAnalysisResultId": crypto_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -996,7 +995,7 @@ def delete_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1085,7 +1084,7 @@ def delete_drs_file(self, fleet_id, drs_file_key, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_drs_file got unknown kwargs: {extra_kwargs!r}") @@ -1095,10 +1094,10 @@ def delete_drs_file(self, fleet_id, drs_file_key, **kwargs): "drsFileKey": drs_file_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1107,7 +1106,7 @@ def delete_drs_file(self, fleet_id, drs_file_key, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1193,7 +1192,7 @@ def delete_fleet(self, fleet_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_fleet got unknown kwargs: {extra_kwargs!r}") @@ -1202,10 +1201,10 @@ def delete_fleet(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1214,7 +1213,7 @@ def delete_fleet(self, fleet_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1303,7 +1302,7 @@ def delete_java_migration_analysis_result(self, fleet_id, java_migration_analysi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_java_migration_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -1313,10 +1312,10 @@ def delete_java_migration_analysis_result(self, fleet_id, java_migration_analysi "javaMigrationAnalysisResultId": java_migration_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1325,7 +1324,7 @@ def delete_java_migration_analysis_result(self, fleet_id, java_migration_analysi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1414,7 +1413,7 @@ def delete_performance_tuning_analysis_result(self, fleet_id, performance_tuning "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_performance_tuning_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -1424,10 +1423,10 @@ def delete_performance_tuning_analysis_result(self, fleet_id, performance_tuning "performanceTuningAnalysisResultId": performance_tuning_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1436,7 +1435,7 @@ def delete_performance_tuning_analysis_result(self, fleet_id, performance_tuning "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1533,7 +1532,7 @@ def disable_drs(self, fleet_id, disable_drs_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_drs got unknown kwargs: {extra_kwargs!r}") @@ -1542,10 +1541,10 @@ def disable_drs(self, fleet_id, disable_drs_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1555,7 +1554,7 @@ def disable_drs(self, fleet_id, disable_drs_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1655,7 +1654,7 @@ def enable_drs(self, fleet_id, enable_drs_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_drs got unknown kwargs: {extra_kwargs!r}") @@ -1664,10 +1663,10 @@ def enable_drs(self, fleet_id, enable_drs_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1677,7 +1676,7 @@ def enable_drs(self, fleet_id, enable_drs_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1761,7 +1760,7 @@ def generate_agent_deploy_script(self, fleet_id, generate_agent_deploy_script_de "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_agent_deploy_script got unknown kwargs: {extra_kwargs!r}") @@ -1770,10 +1769,10 @@ def generate_agent_deploy_script(self, fleet_id, generate_agent_deploy_script_de "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1781,7 +1780,7 @@ def generate_agent_deploy_script(self, fleet_id, generate_agent_deploy_script_de "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1866,7 +1865,7 @@ def get_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_crypto_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -1876,10 +1875,10 @@ def get_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **kwar "cryptoAnalysisResultId": crypto_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1887,7 +1886,7 @@ def get_crypto_analysis_result(self, fleet_id, crypto_analysis_result_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1974,7 +1973,7 @@ def get_drs_file(self, fleet_id, drs_file_key, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_drs_file got unknown kwargs: {extra_kwargs!r}") @@ -1984,23 +1983,23 @@ def get_drs_file(self, fleet_id, drs_file_key, **kwargs): "drsFileKey": drs_file_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2082,7 +2081,7 @@ def get_export_setting(self, fleet_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_export_setting got unknown kwargs: {extra_kwargs!r}") @@ -2091,10 +2090,10 @@ def get_export_setting(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2102,7 +2101,7 @@ def get_export_setting(self, fleet_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2182,7 +2181,7 @@ def get_export_status(self, fleet_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_export_status got unknown kwargs: {extra_kwargs!r}") @@ -2191,10 +2190,10 @@ def get_export_status(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2202,7 +2201,7 @@ def get_export_status(self, fleet_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2282,7 +2281,7 @@ def get_fleet(self, fleet_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fleet got unknown kwargs: {extra_kwargs!r}") @@ -2291,10 +2290,10 @@ def get_fleet(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2302,7 +2301,7 @@ def get_fleet(self, fleet_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2390,7 +2389,7 @@ def get_fleet_advanced_feature_configuration(self, fleet_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fleet_advanced_feature_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2399,10 +2398,10 @@ def get_fleet_advanced_feature_configuration(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2411,7 +2410,7 @@ def get_fleet_advanced_feature_configuration(self, fleet_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2491,7 +2490,7 @@ def get_fleet_agent_configuration(self, fleet_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fleet_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2500,10 +2499,10 @@ def get_fleet_agent_configuration(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2511,7 +2510,7 @@ def get_fleet_agent_configuration(self, fleet_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2589,7 +2588,7 @@ def get_java_family(self, family_version, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_family got unknown kwargs: {extra_kwargs!r}") @@ -2598,10 +2597,10 @@ def get_java_family(self, family_version, **kwargs): "familyVersion": family_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2609,7 +2608,7 @@ def get_java_family(self, family_version, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2692,7 +2691,7 @@ def get_java_migration_analysis_result(self, fleet_id, java_migration_analysis_r "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_migration_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -2702,10 +2701,10 @@ def get_java_migration_analysis_result(self, fleet_id, java_migration_analysis_r "javaMigrationAnalysisResultId": java_migration_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2713,7 +2712,7 @@ def get_java_migration_analysis_result(self, fleet_id, java_migration_analysis_r "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2791,7 +2790,7 @@ def get_java_release(self, release_version, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_release got unknown kwargs: {extra_kwargs!r}") @@ -2800,10 +2799,10 @@ def get_java_release(self, release_version, **kwargs): "releaseVersion": release_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2811,7 +2810,7 @@ def get_java_release(self, release_version, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2894,7 +2893,7 @@ def get_performance_tuning_analysis_result(self, fleet_id, performance_tuning_an "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_performance_tuning_analysis_result got unknown kwargs: {extra_kwargs!r}") @@ -2904,10 +2903,10 @@ def get_performance_tuning_analysis_result(self, fleet_id, performance_tuning_an "performanceTuningAnalysisResultId": performance_tuning_analysis_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2915,7 +2914,7 @@ def get_performance_tuning_analysis_result(self, fleet_id, performance_tuning_an "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2995,7 +2994,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3004,10 +3003,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3015,7 +3014,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3127,7 +3126,7 @@ def list_announcements(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_announcements got unknown kwargs: {extra_kwargs!r}") @@ -3155,14 +3154,14 @@ def list_announcements(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3274,7 +3273,7 @@ def list_blocklists(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_blocklists got unknown kwargs: {extra_kwargs!r}") @@ -3283,10 +3282,10 @@ def list_blocklists(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'operation' in kwargs: @@ -3318,14 +3317,14 @@ def list_blocklists(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3452,7 +3451,7 @@ def list_crypto_analysis_results(self, fleet_id, **kwargs): "time_start", "time_end" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_crypto_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -3461,10 +3460,10 @@ def list_crypto_analysis_results(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'aggregation_mode' in kwargs: @@ -3498,14 +3497,14 @@ def list_crypto_analysis_results(self, fleet_id, **kwargs): "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3609,7 +3608,7 @@ def list_drs_files(self, fleet_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_drs_files got unknown kwargs: {extra_kwargs!r}") @@ -3618,10 +3617,10 @@ def list_drs_files(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3644,14 +3643,14 @@ def list_drs_files(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3741,7 +3740,7 @@ def list_fleet_diagnoses(self, fleet_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fleet_diagnoses got unknown kwargs: {extra_kwargs!r}") @@ -3750,24 +3749,24 @@ def list_fleet_diagnoses(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3893,7 +3892,7 @@ def list_fleets(self, **kwargs): "opc_request_id", "display_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fleets got unknown kwargs: {extra_kwargs!r}") @@ -3930,14 +3929,14 @@ def list_fleets(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayNameContains": kwargs.get("display_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4092,7 +4091,7 @@ def list_installation_sites(self, fleet_id, **kwargs): "time_start", "time_end" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_installation_sites got unknown kwargs: {extra_kwargs!r}") @@ -4101,10 +4100,10 @@ def list_installation_sites(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4153,14 +4152,14 @@ def list_installation_sites(self, fleet_id, **kwargs): "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4270,7 +4269,7 @@ def list_java_families(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_families got unknown kwargs: {extra_kwargs!r}") @@ -4298,14 +4297,14 @@ def list_java_families(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4423,7 +4422,7 @@ def list_java_migration_analysis_results(self, fleet_id, **kwargs): "time_start", "time_end" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_migration_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -4432,10 +4431,10 @@ def list_java_migration_analysis_results(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4461,14 +4460,14 @@ def list_java_migration_analysis_results(self, fleet_id, **kwargs): "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4591,7 +4590,7 @@ def list_java_releases(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_releases got unknown kwargs: {extra_kwargs!r}") @@ -4642,14 +4641,14 @@ def list_java_releases(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4781,7 +4780,7 @@ def list_jre_usage(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jre_usage got unknown kwargs: {extra_kwargs!r}") @@ -4812,14 +4811,14 @@ def list_jre_usage(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4942,7 +4941,7 @@ def list_performance_tuning_analysis_results(self, fleet_id, **kwargs): "time_start", "time_end" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_performance_tuning_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -4951,10 +4950,10 @@ def list_performance_tuning_analysis_results(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4981,14 +4980,14 @@ def list_performance_tuning_analysis_results(self, fleet_id, **kwargs): "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5078,7 +5077,7 @@ def list_work_items(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_items got unknown kwargs: {extra_kwargs!r}") @@ -5087,24 +5086,24 @@ def list_work_items(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5194,7 +5193,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -5203,24 +5202,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5310,7 +5309,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -5319,24 +5318,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5441,7 +5440,7 @@ def list_work_requests(self, **kwargs): "limit", "managed_instance_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5454,14 +5453,14 @@ def list_work_requests(self, **kwargs): "limit": kwargs.get("limit", missing), "managedInstanceId": kwargs.get("managed_instance_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5560,7 +5559,7 @@ def remove_fleet_installation_sites(self, fleet_id, remove_fleet_installation_si "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_fleet_installation_sites got unknown kwargs: {extra_kwargs!r}") @@ -5569,10 +5568,10 @@ def remove_fleet_installation_sites(self, fleet_id, remove_fleet_installation_si "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5582,7 +5581,7 @@ def remove_fleet_installation_sites(self, fleet_id, remove_fleet_installation_si "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5666,7 +5665,7 @@ def request_crypto_analyses(self, fleet_id, request_crypto_analyses_details, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_crypto_analyses got unknown kwargs: {extra_kwargs!r}") @@ -5675,10 +5674,10 @@ def request_crypto_analyses(self, fleet_id, request_crypto_analyses_details, **k "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5686,7 +5685,7 @@ def request_crypto_analyses(self, fleet_id, request_crypto_analyses_details, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5770,7 +5769,7 @@ def request_java_migration_analyses(self, fleet_id, request_java_migration_analy "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_java_migration_analyses got unknown kwargs: {extra_kwargs!r}") @@ -5779,10 +5778,10 @@ def request_java_migration_analyses(self, fleet_id, request_java_migration_analy "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5790,7 +5789,7 @@ def request_java_migration_analyses(self, fleet_id, request_java_migration_analy "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5873,7 +5872,7 @@ def request_jfr_recordings(self, fleet_id, request_jfr_recordings_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_jfr_recordings got unknown kwargs: {extra_kwargs!r}") @@ -5882,10 +5881,10 @@ def request_jfr_recordings(self, fleet_id, request_jfr_recordings_details, **kwa "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5893,7 +5892,7 @@ def request_jfr_recordings(self, fleet_id, request_jfr_recordings_details, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5977,7 +5976,7 @@ def request_performance_tuning_analyses(self, fleet_id, request_performance_tuni "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_performance_tuning_analyses got unknown kwargs: {extra_kwargs!r}") @@ -5986,10 +5985,10 @@ def request_performance_tuning_analyses(self, fleet_id, request_performance_tuni "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5997,7 +5996,7 @@ def request_performance_tuning_analyses(self, fleet_id, request_performance_tuni "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6096,7 +6095,7 @@ def scan_java_server_usage(self, fleet_id, scan_java_server_usage_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"scan_java_server_usage got unknown kwargs: {extra_kwargs!r}") @@ -6105,10 +6104,10 @@ def scan_java_server_usage(self, fleet_id, scan_java_server_usage_details, **kwa "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6118,7 +6117,7 @@ def scan_java_server_usage(self, fleet_id, scan_java_server_usage_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6218,7 +6217,7 @@ def scan_library_usage(self, fleet_id, scan_library_usage_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"scan_library_usage got unknown kwargs: {extra_kwargs!r}") @@ -6227,10 +6226,10 @@ def scan_library_usage(self, fleet_id, scan_library_usage_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6240,7 +6239,7 @@ def scan_library_usage(self, fleet_id, scan_library_usage_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6411,7 +6410,7 @@ def summarize_application_installation_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_application_installation_usage got unknown kwargs: {extra_kwargs!r}") @@ -6420,10 +6419,10 @@ def summarize_application_installation_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'os_family' in kwargs: @@ -6469,14 +6468,14 @@ def summarize_application_installation_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6648,7 +6647,7 @@ def summarize_application_usage(self, fleet_id, **kwargs): "display_name_contains", "library_key" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_application_usage got unknown kwargs: {extra_kwargs!r}") @@ -6657,10 +6656,10 @@ def summarize_application_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -6713,14 +6712,14 @@ def summarize_application_usage(self, fleet_id, **kwargs): "displayNameContains": kwargs.get("display_name_contains", missing), "libraryKey": kwargs.get("library_key", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6871,7 +6870,7 @@ def summarize_deployed_application_installation_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_deployed_application_installation_usage got unknown kwargs: {extra_kwargs!r}") @@ -6880,10 +6879,10 @@ def summarize_deployed_application_installation_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6917,14 +6916,14 @@ def summarize_deployed_application_installation_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7067,7 +7066,7 @@ def summarize_deployed_application_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_deployed_application_usage got unknown kwargs: {extra_kwargs!r}") @@ -7076,10 +7075,10 @@ def summarize_deployed_application_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7111,14 +7110,14 @@ def summarize_deployed_application_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7277,7 +7276,7 @@ def summarize_installation_usage(self, fleet_id, **kwargs): "os_family", "path_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_installation_usage got unknown kwargs: {extra_kwargs!r}") @@ -7286,10 +7285,10 @@ def summarize_installation_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7339,14 +7338,14 @@ def summarize_installation_usage(self, fleet_id, **kwargs): "osFamily": self.base_client.generate_collection_format_param(kwargs.get("os_family", missing), 'multi'), "pathContains": kwargs.get("path_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7489,7 +7488,7 @@ def summarize_java_server_instance_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_java_server_instance_usage got unknown kwargs: {extra_kwargs!r}") @@ -7498,10 +7497,10 @@ def summarize_java_server_instance_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7533,14 +7532,14 @@ def summarize_java_server_instance_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7671,7 +7670,7 @@ def summarize_java_server_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_java_server_usage got unknown kwargs: {extra_kwargs!r}") @@ -7680,10 +7679,10 @@ def summarize_java_server_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7712,14 +7711,14 @@ def summarize_java_server_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7882,7 +7881,7 @@ def summarize_jre_usage(self, fleet_id, **kwargs): "os_family", "jre_security_status" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_jre_usage got unknown kwargs: {extra_kwargs!r}") @@ -7891,10 +7890,10 @@ def summarize_jre_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -7951,14 +7950,14 @@ def summarize_jre_usage(self, fleet_id, **kwargs): "osFamily": self.base_client.generate_collection_format_param(kwargs.get("os_family", missing), 'multi'), "jreSecurityStatus": kwargs.get("jre_security_status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8097,7 +8096,7 @@ def summarize_library_usage(self, fleet_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_library_usage got unknown kwargs: {extra_kwargs!r}") @@ -8106,10 +8105,10 @@ def summarize_library_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8140,14 +8139,14 @@ def summarize_library_usage(self, fleet_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8317,7 +8316,7 @@ def summarize_managed_instance_usage(self, fleet_id, **kwargs): "hostname_contains", "library_key" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_managed_instance_usage got unknown kwargs: {extra_kwargs!r}") @@ -8326,10 +8325,10 @@ def summarize_managed_instance_usage(self, fleet_id, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'managed_instance_type' in kwargs: @@ -8388,14 +8387,14 @@ def summarize_managed_instance_usage(self, fleet_id, **kwargs): "hostnameContains": kwargs.get("hostname_contains", missing), "libraryKey": kwargs.get("library_key", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8490,7 +8489,7 @@ def summarize_resource_inventory(self, **kwargs): "time_end", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_resource_inventory got unknown kwargs: {extra_kwargs!r}") @@ -8500,14 +8499,14 @@ def summarize_resource_inventory(self, **kwargs): "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8609,7 +8608,7 @@ def update_drs_file(self, fleet_id, update_drs_file_details, drs_file_key, **kwa "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_drs_file got unknown kwargs: {extra_kwargs!r}") @@ -8619,10 +8618,10 @@ def update_drs_file(self, fleet_id, update_drs_file_details, drs_file_key, **kwa "drsFileKey": drs_file_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8632,7 +8631,7 @@ def update_drs_file(self, fleet_id, update_drs_file_details, drs_file_key, **kwa "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8724,7 +8723,7 @@ def update_export_setting(self, fleet_id, update_export_setting_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_export_setting got unknown kwargs: {extra_kwargs!r}") @@ -8733,10 +8732,10 @@ def update_export_setting(self, fleet_id, update_export_setting_details, **kwarg "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8745,7 +8744,7 @@ def update_export_setting(self, fleet_id, update_export_setting_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8838,7 +8837,7 @@ def update_fleet(self, fleet_id, update_fleet_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fleet got unknown kwargs: {extra_kwargs!r}") @@ -8847,10 +8846,10 @@ def update_fleet(self, fleet_id, update_fleet_details, **kwargs): "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8859,7 +8858,7 @@ def update_fleet(self, fleet_id, update_fleet_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8959,7 +8958,7 @@ def update_fleet_advanced_feature_configuration(self, fleet_id, update_fleet_adv "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fleet_advanced_feature_configuration got unknown kwargs: {extra_kwargs!r}") @@ -8968,10 +8967,10 @@ def update_fleet_advanced_feature_configuration(self, fleet_id, update_fleet_adv "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8981,7 +8980,7 @@ def update_fleet_advanced_feature_configuration(self, fleet_id, update_fleet_adv "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9075,7 +9074,7 @@ def update_fleet_agent_configuration(self, fleet_id, update_fleet_agent_configur "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_fleet_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -9084,10 +9083,10 @@ def update_fleet_agent_configuration(self, fleet_id, update_fleet_agent_configur "fleetId": fleet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9096,7 +9095,7 @@ def update_fleet_agent_configuration(self, fleet_id, update_fleet_agent_configur "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/jms_java_downloads/java_download_client.py b/src/oci/jms_java_downloads/java_download_client.py index 213710926a..18c3a320dd 100644 --- a/src/oci/jms_java_downloads/java_download_client.py +++ b/src/oci/jms_java_downloads/java_download_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -272,7 +271,7 @@ def create_java_download_report(self, create_java_download_report_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_java_download_report got unknown kwargs: {extra_kwargs!r}") @@ -283,7 +282,7 @@ def create_java_download_report(self, create_java_download_report_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -368,7 +367,7 @@ def create_java_download_token(self, create_java_download_token_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_java_download_token got unknown kwargs: {extra_kwargs!r}") @@ -379,7 +378,7 @@ def create_java_download_token(self, create_java_download_token_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -466,7 +465,7 @@ def create_java_license_acceptance_record(self, create_java_license_acceptance_r "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_java_license_acceptance_record got unknown kwargs: {extra_kwargs!r}") @@ -477,7 +476,7 @@ def create_java_license_acceptance_record(self, create_java_license_acceptance_r "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def delete_java_download_report(self, java_download_report_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_java_download_report got unknown kwargs: {extra_kwargs!r}") @@ -573,10 +572,10 @@ def delete_java_download_report(self, java_download_report_id, **kwargs): "javaDownloadReportId": java_download_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -585,7 +584,7 @@ def delete_java_download_report(self, java_download_report_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -669,7 +668,7 @@ def delete_java_download_token(self, java_download_token_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_java_download_token got unknown kwargs: {extra_kwargs!r}") @@ -678,10 +677,10 @@ def delete_java_download_token(self, java_download_token_id, **kwargs): "javaDownloadTokenId": java_download_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -690,7 +689,7 @@ def delete_java_download_token(self, java_download_token_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -774,7 +773,7 @@ def delete_java_license_acceptance_record(self, java_license_acceptance_record_i "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_java_license_acceptance_record got unknown kwargs: {extra_kwargs!r}") @@ -783,10 +782,10 @@ def delete_java_license_acceptance_record(self, java_license_acceptance_record_i "javaLicenseAcceptanceRecordId": java_license_acceptance_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -795,7 +794,7 @@ def delete_java_license_acceptance_record(self, java_license_acceptance_record_i "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -876,7 +875,7 @@ def generate_artifact_download_url(self, generate_artifact_download_url_details, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_artifact_download_url got unknown kwargs: {extra_kwargs!r}") @@ -886,7 +885,7 @@ def generate_artifact_download_url(self, generate_artifact_download_url_details, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -964,7 +963,7 @@ def get_java_download_report(self, java_download_report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_download_report got unknown kwargs: {extra_kwargs!r}") @@ -973,10 +972,10 @@ def get_java_download_report(self, java_download_report_id, **kwargs): "javaDownloadReportId": java_download_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -984,7 +983,7 @@ def get_java_download_report(self, java_download_report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1062,7 +1061,7 @@ def get_java_download_report_content(self, java_download_report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_download_report_content got unknown kwargs: {extra_kwargs!r}") @@ -1071,10 +1070,10 @@ def get_java_download_report_content(self, java_download_report_id, **kwargs): "javaDownloadReportId": java_download_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1082,7 +1081,7 @@ def get_java_download_report_content(self, java_download_report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1160,7 +1159,7 @@ def get_java_download_token(self, java_download_token_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_download_token got unknown kwargs: {extra_kwargs!r}") @@ -1169,10 +1168,10 @@ def get_java_download_token(self, java_download_token_id, **kwargs): "javaDownloadTokenId": java_download_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1180,7 +1179,7 @@ def get_java_download_token(self, java_download_token_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1260,7 +1259,7 @@ def get_java_license(self, license_type, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_license got unknown kwargs: {extra_kwargs!r}") @@ -1269,10 +1268,10 @@ def get_java_license(self, license_type, **kwargs): "licenseType": license_type } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1280,7 +1279,7 @@ def get_java_license(self, license_type, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1358,7 +1357,7 @@ def get_java_license_acceptance_record(self, java_license_acceptance_record_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_java_license_acceptance_record got unknown kwargs: {extra_kwargs!r}") @@ -1367,10 +1366,10 @@ def get_java_license_acceptance_record(self, java_license_acceptance_record_id, "javaLicenseAcceptanceRecordId": java_license_acceptance_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1378,7 +1377,7 @@ def get_java_license_acceptance_record(self, java_license_acceptance_record_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1456,7 +1455,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1465,10 +1464,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1476,7 +1475,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1610,7 +1609,7 @@ def list_java_download_records(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_download_records got unknown kwargs: {extra_kwargs!r}") @@ -1643,14 +1642,14 @@ def list_java_download_records(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1764,7 +1763,7 @@ def list_java_download_reports(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_download_reports got unknown kwargs: {extra_kwargs!r}") @@ -1800,14 +1799,14 @@ def list_java_download_reports(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1935,7 +1934,7 @@ def list_java_download_tokens(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_download_tokens got unknown kwargs: {extra_kwargs!r}") @@ -1974,14 +1973,14 @@ def list_java_download_tokens(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2103,7 +2102,7 @@ def list_java_license_acceptance_records(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_license_acceptance_records got unknown kwargs: {extra_kwargs!r}") @@ -2147,14 +2146,14 @@ def list_java_license_acceptance_records(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2259,7 +2258,7 @@ def list_java_licenses(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_java_licenses got unknown kwargs: {extra_kwargs!r}") @@ -2293,14 +2292,14 @@ def list_java_licenses(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2398,7 +2397,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2407,10 +2406,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2433,14 +2432,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2540,7 +2539,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2549,10 +2548,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2575,14 +2574,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2698,7 +2697,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2734,14 +2733,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2819,7 +2818,7 @@ def request_summarized_java_download_counts(self, request_summarized_java_downlo "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_java_download_counts got unknown kwargs: {extra_kwargs!r}") @@ -2829,7 +2828,7 @@ def request_summarized_java_download_counts(self, request_summarized_java_downlo "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2918,7 +2917,7 @@ def update_java_download_token(self, java_download_token_id, update_java_downloa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_java_download_token got unknown kwargs: {extra_kwargs!r}") @@ -2927,10 +2926,10 @@ def update_java_download_token(self, java_download_token_id, update_java_downloa "javaDownloadTokenId": java_download_token_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2939,7 +2938,7 @@ def update_java_download_token(self, java_download_token_id, update_java_downloa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3028,7 +3027,7 @@ def update_java_license_acceptance_record(self, java_license_acceptance_record_i "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_java_license_acceptance_record got unknown kwargs: {extra_kwargs!r}") @@ -3037,10 +3036,10 @@ def update_java_license_acceptance_record(self, java_license_acceptance_record_i "javaLicenseAcceptanceRecordId": java_license_acceptance_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3049,7 +3048,7 @@ def update_java_license_acceptance_record(self, java_license_acceptance_record_i "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/key_management/ekm_client.py b/src/oci/key_management/ekm_client.py index 383d986f47..7b93b6de33 100644 --- a/src/oci/key_management/ekm_client.py +++ b/src/oci/key_management/ekm_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def create_ekms_private_endpoint(self, create_ekms_private_endpoint_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ekms_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -180,7 +179,7 @@ def create_ekms_private_endpoint(self, create_ekms_private_endpoint_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -267,7 +266,7 @@ def delete_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ekms_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -276,10 +275,10 @@ def delete_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "ekmsPrivateEndpointId": ekms_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -288,7 +287,7 @@ def delete_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -364,7 +363,7 @@ def get_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ekms_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -373,10 +372,10 @@ def get_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "ekmsPrivateEndpointId": ekms_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -384,7 +383,7 @@ def get_ekms_private_endpoint(self, ekms_private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -485,7 +484,7 @@ def list_ekms_private_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ekms_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -511,14 +510,14 @@ def list_ekms_private_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -607,7 +606,7 @@ def update_ekms_private_endpoint(self, ekms_private_endpoint_id, update_ekms_pri "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ekms_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -616,10 +615,10 @@ def update_ekms_private_endpoint(self, ekms_private_endpoint_id, update_ekms_pri "ekmsPrivateEndpointId": ekms_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -628,7 +627,7 @@ def update_ekms_private_endpoint(self, ekms_private_endpoint_id, update_ekms_pri "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/key_management/kms_crypto_client.py b/src/oci/key_management/kms_crypto_client.py index cb5dd8da50..0727a24288 100644 --- a/src/oci/key_management/kms_crypto_client.py +++ b/src/oci/key_management/kms_crypto_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -160,7 +159,7 @@ def decrypt(self, decrypt_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"decrypt got unknown kwargs: {extra_kwargs!r}") @@ -170,7 +169,7 @@ def decrypt(self, decrypt_data_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -251,7 +250,7 @@ def encrypt(self, encrypt_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"encrypt got unknown kwargs: {extra_kwargs!r}") @@ -261,7 +260,7 @@ def encrypt(self, encrypt_data_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -332,7 +331,7 @@ def export_key(self, export_key_details, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/key/release/ExportedKeyData/ExportKey" expected_kwargs = ["retry_strategy"] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_key got unknown kwargs: {extra_kwargs!r}") @@ -418,7 +417,7 @@ def generate_data_encryption_key(self, generate_key_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_data_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -428,7 +427,7 @@ def generate_data_encryption_key(self, generate_key_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -511,7 +510,7 @@ def sign(self, sign_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"sign got unknown kwargs: {extra_kwargs!r}") @@ -521,7 +520,7 @@ def sign(self, sign_data_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -604,7 +603,7 @@ def verify(self, verify_data_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"verify got unknown kwargs: {extra_kwargs!r}") @@ -614,7 +613,7 @@ def verify(self, verify_data_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/key_management/kms_hsm_cluster_client.py b/src/oci/key_management/kms_hsm_cluster_client.py index 82e48bbd7e..d5dd9011b1 100644 --- a/src/oci/key_management/kms_hsm_cluster_client.py +++ b/src/oci/key_management/kms_hsm_cluster_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def cancel_hsm_cluster_deletion(self, hsm_cluster_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_hsm_cluster_deletion got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def cancel_hsm_cluster_deletion(self, hsm_cluster_id, **kwargs): "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def cancel_hsm_cluster_deletion(self, hsm_cluster_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -298,7 +297,7 @@ def change_hsm_cluster_compartment(self, hsm_cluster_id, change_hsm_cluster_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_hsm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -307,10 +306,10 @@ def change_hsm_cluster_compartment(self, hsm_cluster_id, change_hsm_cluster_comp "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -320,7 +319,7 @@ def change_hsm_cluster_compartment(self, hsm_cluster_id, change_hsm_cluster_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -408,7 +407,7 @@ def create_hsm_cluster(self, create_hsm_cluster_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_hsm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -419,7 +418,7 @@ def create_hsm_cluster(self, create_hsm_cluster_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -515,7 +514,7 @@ def download_certificate_signing_request(self, hsm_cluster_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -524,10 +523,10 @@ def download_certificate_signing_request(self, hsm_cluster_id, **kwargs): "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -537,7 +536,7 @@ def download_certificate_signing_request(self, hsm_cluster_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -621,7 +620,7 @@ def get_hsm_cluster(self, hsm_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_hsm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -630,10 +629,10 @@ def get_hsm_cluster(self, hsm_cluster_id, **kwargs): "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -641,7 +640,7 @@ def get_hsm_cluster(self, hsm_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -731,7 +730,7 @@ def get_hsm_partition(self, hsm_cluster_id, hsm_partition_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_hsm_partition got unknown kwargs: {extra_kwargs!r}") @@ -741,10 +740,10 @@ def get_hsm_partition(self, hsm_cluster_id, hsm_partition_id, **kwargs): "hsmPartitionId": hsm_partition_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -753,7 +752,7 @@ def get_hsm_partition(self, hsm_cluster_id, hsm_partition_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -841,7 +840,7 @@ def get_pre_co_user_credentials(self, hsm_cluster_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pre_co_user_credentials got unknown kwargs: {extra_kwargs!r}") @@ -850,10 +849,10 @@ def get_pre_co_user_credentials(self, hsm_cluster_id, **kwargs): "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -862,7 +861,7 @@ def get_pre_co_user_credentials(self, hsm_cluster_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -969,7 +968,7 @@ def list_hsm_clusters(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_hsm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -995,14 +994,14 @@ def list_hsm_clusters(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1109,7 +1108,7 @@ def list_hsm_partitions(self, hsm_cluster_id, **kwargs): "sort_order", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_hsm_partitions got unknown kwargs: {extra_kwargs!r}") @@ -1118,10 +1117,10 @@ def list_hsm_partitions(self, hsm_cluster_id, **kwargs): "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1152,14 +1151,14 @@ def list_hsm_partitions(self, hsm_cluster_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1260,7 +1259,7 @@ def schedule_hsm_cluster_deletion(self, hsm_cluster_id, schedule_hsm_cluster_del "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_hsm_cluster_deletion got unknown kwargs: {extra_kwargs!r}") @@ -1269,10 +1268,10 @@ def schedule_hsm_cluster_deletion(self, hsm_cluster_id, schedule_hsm_cluster_del "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1282,7 +1281,7 @@ def schedule_hsm_cluster_deletion(self, hsm_cluster_id, schedule_hsm_cluster_del "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1379,7 +1378,7 @@ def update_hsm_cluster(self, hsm_cluster_id, update_hsm_cluster_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_hsm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1388,10 +1387,10 @@ def update_hsm_cluster(self, hsm_cluster_id, update_hsm_cluster_details, **kwarg "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1400,7 +1399,7 @@ def update_hsm_cluster(self, hsm_cluster_id, update_hsm_cluster_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1500,7 +1499,7 @@ def upload_partition_certificates(self, hsm_cluster_id, upload_partition_certifi "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_partition_certificates got unknown kwargs: {extra_kwargs!r}") @@ -1509,10 +1508,10 @@ def upload_partition_certificates(self, hsm_cluster_id, upload_partition_certifi "hsmClusterId": hsm_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1522,7 +1521,7 @@ def upload_partition_certificates(self, hsm_cluster_id, upload_partition_certifi "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/key_management/kms_management_client.py b/src/oci/key_management/kms_management_client.py index 31f6783e57..e3c36f5a2e 100644 --- a/src/oci/key_management/kms_management_client.py +++ b/src/oci/key_management/kms_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def backup_key(self, key_id, **kwargs): "opc_retry_token", "backup_key_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"backup_key got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def backup_key(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def backup_key(self, key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -308,7 +307,7 @@ def cancel_key_deletion(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_key_deletion got unknown kwargs: {extra_kwargs!r}") @@ -317,10 +316,10 @@ def cancel_key_deletion(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -330,7 +329,7 @@ def cancel_key_deletion(self, key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -436,7 +435,7 @@ def cancel_key_version_deletion(self, key_id, key_version_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_key_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -446,10 +445,10 @@ def cancel_key_version_deletion(self, key_id, key_version_id, **kwargs): "keyVersionId": key_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -459,7 +458,7 @@ def cancel_key_version_deletion(self, key_id, key_version_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -568,7 +567,7 @@ def change_key_compartment(self, key_id, change_key_compartment_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_key_compartment got unknown kwargs: {extra_kwargs!r}") @@ -577,10 +576,10 @@ def change_key_compartment(self, key_id, change_key_compartment_details, **kwarg "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -590,7 +589,7 @@ def change_key_compartment(self, key_id, change_key_compartment_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -683,7 +682,7 @@ def create_key(self, create_key_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_key got unknown kwargs: {extra_kwargs!r}") @@ -694,7 +693,7 @@ def create_key(self, create_key_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -794,7 +793,7 @@ def create_key_version(self, key_id, **kwargs): "opc_retry_token", "create_key_metadata_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_key_version got unknown kwargs: {extra_kwargs!r}") @@ -803,10 +802,10 @@ def create_key_version(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -815,7 +814,7 @@ def create_key_version(self, key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -919,7 +918,7 @@ def disable_key(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_key got unknown kwargs: {extra_kwargs!r}") @@ -928,10 +927,10 @@ def disable_key(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -941,7 +940,7 @@ def disable_key(self, key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1043,7 +1042,7 @@ def enable_key(self, key_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_key got unknown kwargs: {extra_kwargs!r}") @@ -1052,10 +1051,10 @@ def enable_key(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1065,7 +1064,7 @@ def enable_key(self, key_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1149,7 +1148,7 @@ def get_key(self, key_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_key got unknown kwargs: {extra_kwargs!r}") @@ -1158,10 +1157,10 @@ def get_key(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1169,7 +1168,7 @@ def get_key(self, key_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1255,7 +1254,7 @@ def get_key_version(self, key_id, key_version_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_key_version got unknown kwargs: {extra_kwargs!r}") @@ -1265,10 +1264,10 @@ def get_key_version(self, key_id, key_version_id, **kwargs): "keyVersionId": key_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1276,7 +1275,7 @@ def get_key_version(self, key_id, key_version_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1357,7 +1356,7 @@ def get_replication_status(self, replication_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication_status got unknown kwargs: {extra_kwargs!r}") @@ -1366,10 +1365,10 @@ def get_replication_status(self, replication_id, **kwargs): "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1377,7 +1376,7 @@ def get_replication_status(self, replication_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1453,7 +1452,7 @@ def get_wrapping_key(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_wrapping_key got unknown kwargs: {extra_kwargs!r}") @@ -1463,7 +1462,7 @@ def get_wrapping_key(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1553,7 +1552,7 @@ def import_key(self, import_key_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_key got unknown kwargs: {extra_kwargs!r}") @@ -1564,7 +1563,7 @@ def import_key(self, import_key_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1660,7 +1659,7 @@ def import_key_version(self, key_id, import_key_version_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_key_version got unknown kwargs: {extra_kwargs!r}") @@ -1669,10 +1668,10 @@ def import_key_version(self, key_id, import_key_version_details, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1681,7 +1680,7 @@ def import_key_version(self, key_id, import_key_version_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1793,7 +1792,7 @@ def list_key_versions(self, key_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_key_versions got unknown kwargs: {extra_kwargs!r}") @@ -1802,10 +1801,10 @@ def list_key_versions(self, key_id, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1828,14 +1827,14 @@ def list_key_versions(self, key_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1971,7 +1970,7 @@ def list_keys(self, compartment_id, **kwargs): "length", "curve_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_keys got unknown kwargs: {extra_kwargs!r}") @@ -2022,14 +2021,14 @@ def list_keys(self, compartment_id, **kwargs): "length": kwargs.get("length", missing), "curveId": kwargs.get("curve_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2148,7 +2147,7 @@ def restore_key_from_file(self, restore_key_from_file_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_key_from_file got unknown kwargs: {extra_kwargs!r}") @@ -2161,7 +2160,7 @@ def restore_key_from_file(self, restore_key_from_file_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -2170,7 +2169,7 @@ def restore_key_from_file(self, restore_key_from_file_details, **kwargs): restore_key_from_file_details = kwargs.get("restore_key_from_file_details", missing) if restore_key_from_file_details is not missing and restore_key_from_file_details is not None: - if (not isinstance(restore_key_from_file_details, (six.binary_type, six.string_types)) and + if (not isinstance(restore_key_from_file_details, (bytes, str)) and not hasattr(restore_key_from_file_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2281,7 +2280,7 @@ def restore_key_from_object_store(self, **kwargs): "opc_retry_token", "restore_key_from_object_store_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_key_from_object_store got unknown kwargs: {extra_kwargs!r}") @@ -2293,7 +2292,7 @@ def restore_key_from_object_store(self, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2398,7 +2397,7 @@ def schedule_key_deletion(self, key_id, schedule_key_deletion_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_key_deletion got unknown kwargs: {extra_kwargs!r}") @@ -2407,10 +2406,10 @@ def schedule_key_deletion(self, key_id, schedule_key_deletion_details, **kwargs) "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2420,7 +2419,7 @@ def schedule_key_deletion(self, key_id, schedule_key_deletion_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2530,7 +2529,7 @@ def schedule_key_version_deletion(self, key_id, key_version_id, schedule_key_ver "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_key_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -2540,10 +2539,10 @@ def schedule_key_version_deletion(self, key_id, key_version_id, schedule_key_ver "keyVersionId": key_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2553,7 +2552,7 @@ def schedule_key_version_deletion(self, key_id, key_version_id, schedule_key_ver "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2652,7 +2651,7 @@ def update_key(self, key_id, update_key_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_key got unknown kwargs: {extra_kwargs!r}") @@ -2661,10 +2660,10 @@ def update_key(self, key_id, update_key_details, **kwargs): "keyId": key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2673,7 +2672,7 @@ def update_key(self, key_id, update_key_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/key_management/kms_vault_client.py b/src/oci/key_management/kms_vault_client.py index 52bb9de86d..666c5fdf50 100644 --- a/src/oci/key_management/kms_vault_client.py +++ b/src/oci/key_management/kms_vault_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -184,7 +183,7 @@ def backup_vault(self, vault_id, **kwargs): "opc_retry_token", "backup_vault_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"backup_vault got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def backup_vault(self, vault_id, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -206,7 +205,7 @@ def backup_vault(self, vault_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -312,7 +311,7 @@ def cancel_vault_deletion(self, vault_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_vault_deletion got unknown kwargs: {extra_kwargs!r}") @@ -321,10 +320,10 @@ def cancel_vault_deletion(self, vault_id, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -334,7 +333,7 @@ def cancel_vault_deletion(self, vault_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -443,7 +442,7 @@ def change_vault_compartment(self, vault_id, change_vault_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vault_compartment got unknown kwargs: {extra_kwargs!r}") @@ -452,10 +451,10 @@ def change_vault_compartment(self, vault_id, change_vault_compartment_details, * "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -465,7 +464,7 @@ def change_vault_compartment(self, vault_id, change_vault_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -561,7 +560,7 @@ def create_vault(self, create_vault_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vault got unknown kwargs: {extra_kwargs!r}") @@ -572,7 +571,7 @@ def create_vault(self, create_vault_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -680,7 +679,7 @@ def create_vault_replica(self, vault_id, create_vault_replica_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vault_replica got unknown kwargs: {extra_kwargs!r}") @@ -689,10 +688,10 @@ def create_vault_replica(self, vault_id, create_vault_replica_details, **kwargs) "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -702,7 +701,7 @@ def create_vault_replica(self, vault_id, create_vault_replica_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -806,7 +805,7 @@ def delete_vault_replica(self, vault_id, delete_vault_replica_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vault_replica got unknown kwargs: {extra_kwargs!r}") @@ -815,10 +814,10 @@ def delete_vault_replica(self, vault_id, delete_vault_replica_details, **kwargs) "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -828,7 +827,7 @@ def delete_vault_replica(self, vault_id, delete_vault_replica_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -912,7 +911,7 @@ def get_vault(self, vault_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vault got unknown kwargs: {extra_kwargs!r}") @@ -921,10 +920,10 @@ def get_vault(self, vault_id, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -932,7 +931,7 @@ def get_vault(self, vault_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1010,7 +1009,7 @@ def get_vault_usage(self, vault_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vault_usage got unknown kwargs: {extra_kwargs!r}") @@ -1019,10 +1018,10 @@ def get_vault_usage(self, vault_id, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1030,7 +1029,7 @@ def get_vault_usage(self, vault_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1153,7 +1152,7 @@ def list_vault_replicas(self, vault_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vault_replicas got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def list_vault_replicas(self, vault_id, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1188,7 +1187,7 @@ def list_vault_replicas(self, vault_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1197,7 +1196,7 @@ def list_vault_replicas(self, vault_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1306,7 +1305,7 @@ def list_vaults(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vaults got unknown kwargs: {extra_kwargs!r}") @@ -1332,14 +1331,14 @@ def list_vaults(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1461,7 +1460,7 @@ def restore_vault_from_file(self, compartment_id, restore_vault_from_file_detail "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_vault_from_file got unknown kwargs: {extra_kwargs!r}") @@ -1469,7 +1468,7 @@ def restore_vault_from_file(self, compartment_id, restore_vault_from_file_detail query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1479,7 +1478,7 @@ def restore_vault_from_file(self, compartment_id, restore_vault_from_file_detail "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1488,7 +1487,7 @@ def restore_vault_from_file(self, compartment_id, restore_vault_from_file_detail restore_vault_from_file_details = kwargs.get("restore_vault_from_file_details", missing) if restore_vault_from_file_details is not missing and restore_vault_from_file_details is not None: - if (not isinstance(restore_vault_from_file_details, (six.binary_type, six.string_types)) and + if (not isinstance(restore_vault_from_file_details, (bytes, str)) and not hasattr(restore_vault_from_file_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1604,7 +1603,7 @@ def restore_vault_from_object_store(self, compartment_id, **kwargs): "opc_retry_token", "restore_vault_from_object_store_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_vault_from_object_store got unknown kwargs: {extra_kwargs!r}") @@ -1612,7 +1611,7 @@ def restore_vault_from_object_store(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1621,7 +1620,7 @@ def restore_vault_from_object_store(self, compartment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1731,7 +1730,7 @@ def schedule_vault_deletion(self, vault_id, schedule_vault_deletion_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_vault_deletion got unknown kwargs: {extra_kwargs!r}") @@ -1740,10 +1739,10 @@ def schedule_vault_deletion(self, vault_id, schedule_vault_deletion_details, **k "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1753,7 +1752,7 @@ def schedule_vault_deletion(self, vault_id, schedule_vault_deletion_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1852,7 +1851,7 @@ def update_vault(self, vault_id, update_vault_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vault got unknown kwargs: {extra_kwargs!r}") @@ -1861,10 +1860,10 @@ def update_vault(self, vault_id, update_vault_details, **kwargs): "vaultId": vault_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1873,7 +1872,7 @@ def update_vault(self, vault_id, update_vault_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/license_manager/license_manager_client.py b/src/oci/license_manager/license_manager_client.py index 39f93e3cf3..483eb94c63 100644 --- a/src/oci/license_manager/license_manager_client.py +++ b/src/oci/license_manager/license_manager_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -159,7 +158,7 @@ def bulk_upload_license_records(self, bulk_upload_license_records_details, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_license_records got unknown kwargs: {extra_kwargs!r}") @@ -169,7 +168,7 @@ def bulk_upload_license_records(self, bulk_upload_license_records_details, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -258,7 +257,7 @@ def create_license_record(self, create_license_record_details, product_license_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_license_record got unknown kwargs: {extra_kwargs!r}") @@ -266,7 +265,7 @@ def create_license_record(self, create_license_record_details, product_license_i query_params = { "productLicenseId": product_license_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -274,7 +273,7 @@ def create_license_record(self, create_license_record_details, product_license_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -363,7 +362,7 @@ def create_product_license(self, create_product_license_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_product_license got unknown kwargs: {extra_kwargs!r}") @@ -374,7 +373,7 @@ def create_product_license(self, create_product_license_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -460,7 +459,7 @@ def delete_license_record(self, license_record_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_license_record got unknown kwargs: {extra_kwargs!r}") @@ -469,10 +468,10 @@ def delete_license_record(self, license_record_id, **kwargs): "licenseRecordId": license_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -481,7 +480,7 @@ def delete_license_record(self, license_record_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def delete_product_license(self, product_license_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_product_license got unknown kwargs: {extra_kwargs!r}") @@ -573,10 +572,10 @@ def delete_product_license(self, product_license_id, **kwargs): "productLicenseId": product_license_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -585,7 +584,7 @@ def delete_product_license(self, product_license_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -659,7 +658,7 @@ def get_bulk_upload_template(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bulk_upload_template got unknown kwargs: {extra_kwargs!r}") @@ -669,7 +668,7 @@ def get_bulk_upload_template(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -748,7 +747,7 @@ def get_configuration(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration got unknown kwargs: {extra_kwargs!r}") @@ -756,14 +755,14 @@ def get_configuration(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -848,7 +847,7 @@ def get_license_metric(self, compartment_id, **kwargs): "opc_request_id", "is_compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_license_metric got unknown kwargs: {extra_kwargs!r}") @@ -857,14 +856,14 @@ def get_license_metric(self, compartment_id, **kwargs): "compartmentId": compartment_id, "isCompartmentIdInSubtree": kwargs.get("is_compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -943,7 +942,7 @@ def get_license_record(self, license_record_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_license_record got unknown kwargs: {extra_kwargs!r}") @@ -952,10 +951,10 @@ def get_license_record(self, license_record_id, **kwargs): "licenseRecordId": license_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -963,7 +962,7 @@ def get_license_record(self, license_record_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1042,7 +1041,7 @@ def get_product_license(self, product_license_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_product_license got unknown kwargs: {extra_kwargs!r}") @@ -1051,10 +1050,10 @@ def get_product_license(self, product_license_id, **kwargs): "productLicenseId": product_license_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1062,7 +1061,7 @@ def get_product_license(self, product_license_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1165,7 +1164,7 @@ def list_license_records(self, product_license_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_license_records got unknown kwargs: {extra_kwargs!r}") @@ -1191,14 +1190,14 @@ def list_license_records(self, product_license_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1310,7 +1309,7 @@ def list_product_license_consumers(self, product_license_id, compartment_id, **k "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_product_license_consumers got unknown kwargs: {extra_kwargs!r}") @@ -1338,14 +1337,14 @@ def list_product_license_consumers(self, product_license_id, compartment_id, **k "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1454,7 +1453,7 @@ def list_product_licenses(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_product_licenses got unknown kwargs: {extra_kwargs!r}") @@ -1481,14 +1480,14 @@ def list_product_licenses(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1597,7 +1596,7 @@ def list_top_utilized_product_licenses(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_top_utilized_product_licenses got unknown kwargs: {extra_kwargs!r}") @@ -1624,14 +1623,14 @@ def list_top_utilized_product_licenses(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1746,7 +1745,7 @@ def list_top_utilized_resources(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_top_utilized_resources got unknown kwargs: {extra_kwargs!r}") @@ -1781,14 +1780,14 @@ def list_top_utilized_resources(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1878,7 +1877,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1886,7 +1885,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1894,7 +1893,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1984,7 +1983,7 @@ def update_license_record(self, license_record_id, update_license_record_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_license_record got unknown kwargs: {extra_kwargs!r}") @@ -1993,10 +1992,10 @@ def update_license_record(self, license_record_id, update_license_record_details "licenseRecordId": license_record_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2005,7 +2004,7 @@ def update_license_record(self, license_record_id, update_license_record_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2095,7 +2094,7 @@ def update_product_license(self, product_license_id, update_product_license_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_product_license got unknown kwargs: {extra_kwargs!r}") @@ -2104,10 +2103,10 @@ def update_product_license(self, product_license_id, update_product_license_deta "productLicenseId": product_license_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2116,7 +2115,7 @@ def update_product_license(self, product_license_id, update_product_license_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/limits/limits_client.py b/src/oci/limits/limits_client.py index 93f512832d..8334addf53 100644 --- a/src/oci/limits/limits_client.py +++ b/src/oci/limits/limits_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def get_resource_availability(self, service_name, limit_name, compartment_id, ** "availability_domain", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resource_availability got unknown kwargs: {extra_kwargs!r}") @@ -184,24 +183,24 @@ def get_resource_availability(self, service_name, limit_name, compartment_id, ** "limitName": limit_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id, "availabilityDomain": kwargs.get("availability_domain", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -312,7 +311,7 @@ def list_limit_definitions(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_limit_definitions got unknown kwargs: {extra_kwargs!r}") @@ -340,14 +339,14 @@ def list_limit_definitions(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -463,7 +462,7 @@ def list_limit_values(self, compartment_id, service_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_limit_values got unknown kwargs: {extra_kwargs!r}") @@ -500,14 +499,14 @@ def list_limit_values(self, compartment_id, service_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -607,7 +606,7 @@ def list_services(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_services got unknown kwargs: {extra_kwargs!r}") @@ -633,14 +632,14 @@ def list_services(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/limits/quotas_client.py b/src/oci/limits/quotas_client.py index 735334ff38..32636c1e33 100644 --- a/src/oci/limits/quotas_client.py +++ b/src/oci/limits/quotas_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def add_quota_lock(self, quota_id, add_lock_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_quota_lock got unknown kwargs: {extra_kwargs!r}") @@ -176,10 +175,10 @@ def add_quota_lock(self, quota_id, add_lock_details, **kwargs): "quotaId": quota_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -188,7 +187,7 @@ def add_quota_lock(self, quota_id, add_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -275,7 +274,7 @@ def create_quota(self, create_quota_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_quota got unknown kwargs: {extra_kwargs!r}") @@ -286,7 +285,7 @@ def create_quota(self, create_quota_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -376,7 +375,7 @@ def delete_quota(self, quota_id, **kwargs): "if_match", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_quota got unknown kwargs: {extra_kwargs!r}") @@ -385,16 +384,16 @@ def delete_quota(self, quota_id, **kwargs): "quotaId": quota_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -402,7 +401,7 @@ def delete_quota(self, quota_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -481,7 +480,7 @@ def get_quota(self, quota_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_quota got unknown kwargs: {extra_kwargs!r}") @@ -490,10 +489,10 @@ def get_quota(self, quota_id, **kwargs): "quotaId": quota_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -501,7 +500,7 @@ def get_quota(self, quota_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -610,7 +609,7 @@ def list_quotas(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_quotas got unknown kwargs: {extra_kwargs!r}") @@ -645,14 +644,14 @@ def list_quotas(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -739,7 +738,7 @@ def remove_quota_lock(self, quota_id, remove_lock_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_quota_lock got unknown kwargs: {extra_kwargs!r}") @@ -748,10 +747,10 @@ def remove_quota_lock(self, quota_id, remove_lock_details, **kwargs): "quotaId": quota_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -760,7 +759,7 @@ def remove_quota_lock(self, quota_id, remove_lock_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -852,7 +851,7 @@ def update_quota(self, quota_id, update_quota_details, **kwargs): "if_match", "is_lock_override" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_quota got unknown kwargs: {extra_kwargs!r}") @@ -861,16 +860,16 @@ def update_quota(self, quota_id, update_quota_details, **kwargs): "quotaId": quota_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -878,7 +877,7 @@ def update_quota(self, quota_id, update_quota_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/load_balancer/load_balancer_client.py b/src/oci/load_balancer/load_balancer_client.py index 26b3584a86..e821498196 100644 --- a/src/oci/load_balancer/load_balancer_client.py +++ b/src/oci/load_balancer/load_balancer_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -189,7 +188,7 @@ def change_load_balancer_compartment(self, load_balancer_id, change_load_balance "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_load_balancer_compartment got unknown kwargs: {extra_kwargs!r}") @@ -198,10 +197,10 @@ def change_load_balancer_compartment(self, load_balancer_id, change_load_balance "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -211,7 +210,7 @@ def change_load_balancer_compartment(self, load_balancer_id, change_load_balance "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -320,7 +319,7 @@ def create_backend(self, create_backend_details, load_balancer_id, backend_set_n "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backend got unknown kwargs: {extra_kwargs!r}") @@ -330,10 +329,10 @@ def create_backend(self, create_backend_details, load_balancer_id, backend_set_n "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -343,7 +342,7 @@ def create_backend(self, create_backend_details, load_balancer_id, backend_set_n "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -447,7 +446,7 @@ def create_backend_set(self, create_backend_set_details, load_balancer_id, **kwa "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -456,10 +455,10 @@ def create_backend_set(self, create_backend_set_details, load_balancer_id, **kwa "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -469,7 +468,7 @@ def create_backend_set(self, create_backend_set_details, load_balancer_id, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -573,7 +572,7 @@ def create_certificate(self, create_certificate_details, load_balancer_id, **kwa "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -582,10 +581,10 @@ def create_certificate(self, create_certificate_details, load_balancer_id, **kwa "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -595,7 +594,7 @@ def create_certificate(self, create_certificate_details, load_balancer_id, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -702,7 +701,7 @@ def create_hostname(self, create_hostname_details, load_balancer_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_hostname got unknown kwargs: {extra_kwargs!r}") @@ -711,10 +710,10 @@ def create_hostname(self, create_hostname_details, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -724,7 +723,7 @@ def create_hostname(self, create_hostname_details, load_balancer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -828,7 +827,7 @@ def create_listener(self, create_listener_details, load_balancer_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listener got unknown kwargs: {extra_kwargs!r}") @@ -837,10 +836,10 @@ def create_listener(self, create_listener_details, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -850,7 +849,7 @@ def create_listener(self, create_listener_details, load_balancer_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -967,7 +966,7 @@ def create_load_balancer(self, create_load_balancer_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -978,7 +977,7 @@ def create_load_balancer(self, create_load_balancer_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1083,7 +1082,7 @@ def create_path_route_set(self, create_path_route_set_details, load_balancer_id, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_path_route_set got unknown kwargs: {extra_kwargs!r}") @@ -1092,10 +1091,10 @@ def create_path_route_set(self, create_path_route_set_details, load_balancer_id, "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1105,7 +1104,7 @@ def create_path_route_set(self, create_path_route_set_details, load_balancer_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1212,7 +1211,7 @@ def create_routing_policy(self, create_routing_policy_details, load_balancer_id, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_routing_policy got unknown kwargs: {extra_kwargs!r}") @@ -1221,10 +1220,10 @@ def create_routing_policy(self, create_routing_policy_details, load_balancer_id, "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1234,7 +1233,7 @@ def create_routing_policy(self, create_routing_policy_details, load_balancer_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1341,7 +1340,7 @@ def create_rule_set(self, load_balancer_id, create_rule_set_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rule_set got unknown kwargs: {extra_kwargs!r}") @@ -1350,10 +1349,10 @@ def create_rule_set(self, load_balancer_id, create_rule_set_details, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1363,7 +1362,7 @@ def create_rule_set(self, load_balancer_id, create_rule_set_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1467,7 +1466,7 @@ def create_ssl_cipher_suite(self, create_ssl_cipher_suite_details, load_balancer "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ssl_cipher_suite got unknown kwargs: {extra_kwargs!r}") @@ -1476,10 +1475,10 @@ def create_ssl_cipher_suite(self, create_ssl_cipher_suite_details, load_balancer "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1489,7 +1488,7 @@ def create_ssl_cipher_suite(self, create_ssl_cipher_suite_details, load_balancer "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1592,7 +1591,7 @@ def delete_backend(self, load_balancer_id, backend_set_name, backend_name, **kwa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backend got unknown kwargs: {extra_kwargs!r}") @@ -1603,10 +1602,10 @@ def delete_backend(self, load_balancer_id, backend_set_name, backend_name, **kwa "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1615,7 +1614,7 @@ def delete_backend(self, load_balancer_id, backend_set_name, backend_name, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1712,7 +1711,7 @@ def delete_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -1722,10 +1721,10 @@ def delete_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1734,7 +1733,7 @@ def delete_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1830,7 +1829,7 @@ def delete_certificate(self, load_balancer_id, certificate_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1840,10 +1839,10 @@ def delete_certificate(self, load_balancer_id, certificate_name, **kwargs): "certificateName": certificate_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1852,7 +1851,7 @@ def delete_certificate(self, load_balancer_id, certificate_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1947,7 +1946,7 @@ def delete_hostname(self, load_balancer_id, name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_hostname got unknown kwargs: {extra_kwargs!r}") @@ -1957,10 +1956,10 @@ def delete_hostname(self, load_balancer_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1969,7 +1968,7 @@ def delete_hostname(self, load_balancer_id, name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2064,7 +2063,7 @@ def delete_listener(self, load_balancer_id, listener_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listener got unknown kwargs: {extra_kwargs!r}") @@ -2074,10 +2073,10 @@ def delete_listener(self, load_balancer_id, listener_name, **kwargs): "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2086,7 +2085,7 @@ def delete_listener(self, load_balancer_id, listener_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2176,7 +2175,7 @@ def delete_load_balancer(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -2185,10 +2184,10 @@ def delete_load_balancer(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2197,7 +2196,7 @@ def delete_load_balancer(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2295,7 +2294,7 @@ def delete_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_path_route_set got unknown kwargs: {extra_kwargs!r}") @@ -2305,10 +2304,10 @@ def delete_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs) "pathRouteSetName": path_route_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2317,7 +2316,7 @@ def delete_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2415,7 +2414,7 @@ def delete_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_routing_policy got unknown kwargs: {extra_kwargs!r}") @@ -2425,10 +2424,10 @@ def delete_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs) "routingPolicyName": routing_policy_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2437,7 +2436,7 @@ def delete_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2535,7 +2534,7 @@ def delete_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rule_set got unknown kwargs: {extra_kwargs!r}") @@ -2545,10 +2544,10 @@ def delete_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "ruleSetName": rule_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2557,7 +2556,7 @@ def delete_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2652,7 +2651,7 @@ def delete_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ssl_cipher_suite got unknown kwargs: {extra_kwargs!r}") @@ -2662,10 +2661,10 @@ def delete_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2674,7 +2673,7 @@ def delete_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2774,7 +2773,7 @@ def get_backend(self, load_balancer_id, backend_set_name, backend_name, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend got unknown kwargs: {extra_kwargs!r}") @@ -2785,10 +2784,10 @@ def get_backend(self, load_balancer_id, backend_set_name, backend_name, **kwargs "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2797,7 +2796,7 @@ def get_backend(self, load_balancer_id, backend_set_name, backend_name, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2899,7 +2898,7 @@ def get_backend_health(self, load_balancer_id, backend_set_name, backend_name, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_health got unknown kwargs: {extra_kwargs!r}") @@ -2910,10 +2909,10 @@ def get_backend_health(self, load_balancer_id, backend_set_name, backend_name, * "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2922,7 +2921,7 @@ def get_backend_health(self, load_balancer_id, backend_set_name, backend_name, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3019,7 +3018,7 @@ def get_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -3029,10 +3028,10 @@ def get_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3041,7 +3040,7 @@ def get_backend_set(self, load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3138,7 +3137,7 @@ def get_backend_set_health(self, load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_set_health got unknown kwargs: {extra_kwargs!r}") @@ -3148,10 +3147,10 @@ def get_backend_set_health(self, load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3160,7 +3159,7 @@ def get_backend_set_health(self, load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3257,7 +3256,7 @@ def get_health_checker(self, load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_health_checker got unknown kwargs: {extra_kwargs!r}") @@ -3267,10 +3266,10 @@ def get_health_checker(self, load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3279,7 +3278,7 @@ def get_health_checker(self, load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3376,7 +3375,7 @@ def get_hostname(self, load_balancer_id, name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_hostname got unknown kwargs: {extra_kwargs!r}") @@ -3386,10 +3385,10 @@ def get_hostname(self, load_balancer_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3398,7 +3397,7 @@ def get_hostname(self, load_balancer_id, name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3490,7 +3489,7 @@ def get_load_balancer(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -3499,10 +3498,10 @@ def get_load_balancer(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3511,7 +3510,7 @@ def get_load_balancer(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3603,7 +3602,7 @@ def get_load_balancer_health(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_load_balancer_health got unknown kwargs: {extra_kwargs!r}") @@ -3612,10 +3611,10 @@ def get_load_balancer_health(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3624,7 +3623,7 @@ def get_load_balancer_health(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3721,7 +3720,7 @@ def get_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_path_route_set got unknown kwargs: {extra_kwargs!r}") @@ -3731,10 +3730,10 @@ def get_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs): "pathRouteSetName": path_route_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3743,7 +3742,7 @@ def get_path_route_set(self, load_balancer_id, path_route_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3840,7 +3839,7 @@ def get_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_routing_policy got unknown kwargs: {extra_kwargs!r}") @@ -3850,10 +3849,10 @@ def get_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs): "routingPolicyName": routing_policy_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3862,7 +3861,7 @@ def get_routing_policy(self, load_balancer_id, routing_policy_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3959,7 +3958,7 @@ def get_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rule_set got unknown kwargs: {extra_kwargs!r}") @@ -3969,10 +3968,10 @@ def get_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "ruleSetName": rule_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3981,7 +3980,7 @@ def get_rule_set(self, load_balancer_id, rule_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4078,7 +4077,7 @@ def get_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ssl_cipher_suite got unknown kwargs: {extra_kwargs!r}") @@ -4088,10 +4087,10 @@ def get_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4100,7 +4099,7 @@ def get_ssl_cipher_suite(self, load_balancer_id, name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4179,7 +4178,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -4188,10 +4187,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4199,7 +4198,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4291,7 +4290,7 @@ def list_backend_sets(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backend_sets got unknown kwargs: {extra_kwargs!r}") @@ -4300,10 +4299,10 @@ def list_backend_sets(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4312,7 +4311,7 @@ def list_backend_sets(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4409,7 +4408,7 @@ def list_backends(self, load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backends got unknown kwargs: {extra_kwargs!r}") @@ -4419,10 +4418,10 @@ def list_backends(self, load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4431,7 +4430,7 @@ def list_backends(self, load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4524,7 +4523,7 @@ def list_certificates(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificates got unknown kwargs: {extra_kwargs!r}") @@ -4533,10 +4532,10 @@ def list_certificates(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4545,7 +4544,7 @@ def list_certificates(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4638,7 +4637,7 @@ def list_hostnames(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_hostnames got unknown kwargs: {extra_kwargs!r}") @@ -4647,10 +4646,10 @@ def list_hostnames(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4659,7 +4658,7 @@ def list_hostnames(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4760,7 +4759,7 @@ def list_listener_rules(self, load_balancer_id, listener_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listener_rules got unknown kwargs: {extra_kwargs!r}") @@ -4770,10 +4769,10 @@ def list_listener_rules(self, load_balancer_id, listener_name, **kwargs): "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4782,7 +4781,7 @@ def list_listener_rules(self, load_balancer_id, listener_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4879,7 +4878,7 @@ def list_load_balancer_healths(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_load_balancer_healths got unknown kwargs: {extra_kwargs!r}") @@ -4889,14 +4888,14 @@ def list_load_balancer_healths(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5026,7 +5025,7 @@ def list_load_balancers(self, compartment_id, **kwargs): "display_name", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_load_balancers got unknown kwargs: {extra_kwargs!r}") @@ -5062,14 +5061,14 @@ def list_load_balancers(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5162,7 +5161,7 @@ def list_path_route_sets(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_path_route_sets got unknown kwargs: {extra_kwargs!r}") @@ -5171,10 +5170,10 @@ def list_path_route_sets(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5183,7 +5182,7 @@ def list_path_route_sets(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5280,7 +5279,7 @@ def list_policies(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_policies got unknown kwargs: {extra_kwargs!r}") @@ -5290,14 +5289,14 @@ def list_policies(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5394,7 +5393,7 @@ def list_protocols(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protocols got unknown kwargs: {extra_kwargs!r}") @@ -5404,14 +5403,14 @@ def list_protocols(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5521,7 +5520,7 @@ def list_routing_policies(self, load_balancer_id, **kwargs): "page", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_routing_policies got unknown kwargs: {extra_kwargs!r}") @@ -5530,17 +5529,17 @@ def list_routing_policies(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -5548,7 +5547,7 @@ def list_routing_policies(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5642,7 +5641,7 @@ def list_rule_sets(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rule_sets got unknown kwargs: {extra_kwargs!r}") @@ -5651,10 +5650,10 @@ def list_rule_sets(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5663,7 +5662,7 @@ def list_rule_sets(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5760,7 +5759,7 @@ def list_shapes(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shapes got unknown kwargs: {extra_kwargs!r}") @@ -5770,14 +5769,14 @@ def list_shapes(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5869,7 +5868,7 @@ def list_ssl_cipher_suites(self, load_balancer_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ssl_cipher_suites got unknown kwargs: {extra_kwargs!r}") @@ -5878,10 +5877,10 @@ def list_ssl_cipher_suites(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5890,7 +5889,7 @@ def list_ssl_cipher_suites(self, load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5987,7 +5986,7 @@ def list_work_requests(self, load_balancer_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5996,24 +5995,24 @@ def list_work_requests(self, load_balancer_id, **kwargs): "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6128,7 +6127,7 @@ def update_backend(self, update_backend_details, load_balancer_id, backend_set_n "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backend got unknown kwargs: {extra_kwargs!r}") @@ -6139,10 +6138,10 @@ def update_backend(self, update_backend_details, load_balancer_id, backend_set_n "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6152,7 +6151,7 @@ def update_backend(self, update_backend_details, load_balancer_id, backend_set_n "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6261,7 +6260,7 @@ def update_backend_set(self, update_backend_set_details, load_balancer_id, backe "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -6271,10 +6270,10 @@ def update_backend_set(self, update_backend_set_details, load_balancer_id, backe "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6284,7 +6283,7 @@ def update_backend_set(self, update_backend_set_details, load_balancer_id, backe "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6393,7 +6392,7 @@ def update_health_checker(self, health_checker, load_balancer_id, backend_set_na "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_health_checker got unknown kwargs: {extra_kwargs!r}") @@ -6403,10 +6402,10 @@ def update_health_checker(self, health_checker, load_balancer_id, backend_set_na "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6416,7 +6415,7 @@ def update_health_checker(self, health_checker, load_balancer_id, backend_set_na "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6527,7 +6526,7 @@ def update_hostname(self, update_hostname_details, load_balancer_id, name, **kwa "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_hostname got unknown kwargs: {extra_kwargs!r}") @@ -6537,10 +6536,10 @@ def update_hostname(self, update_hostname_details, load_balancer_id, name, **kwa "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6550,7 +6549,7 @@ def update_hostname(self, update_hostname_details, load_balancer_id, name, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6659,7 +6658,7 @@ def update_listener(self, update_listener_details, load_balancer_id, listener_na "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listener got unknown kwargs: {extra_kwargs!r}") @@ -6669,10 +6668,10 @@ def update_listener(self, update_listener_details, load_balancer_id, listener_na "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6682,7 +6681,7 @@ def update_listener(self, update_listener_details, load_balancer_id, listener_na "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6786,7 +6785,7 @@ def update_load_balancer(self, update_load_balancer_details, load_balancer_id, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -6795,10 +6794,10 @@ def update_load_balancer(self, update_load_balancer_details, load_balancer_id, * "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6808,7 +6807,7 @@ def update_load_balancer(self, update_load_balancer_details, load_balancer_id, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6917,7 +6916,7 @@ def update_load_balancer_shape(self, load_balancer_id, update_load_balancer_shap "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_load_balancer_shape got unknown kwargs: {extra_kwargs!r}") @@ -6926,10 +6925,10 @@ def update_load_balancer_shape(self, load_balancer_id, update_load_balancer_shap "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6939,7 +6938,7 @@ def update_load_balancer_shape(self, load_balancer_id, update_load_balancer_shap "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7043,7 +7042,7 @@ def update_network_security_groups(self, update_network_security_groups_details, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_security_groups got unknown kwargs: {extra_kwargs!r}") @@ -7052,10 +7051,10 @@ def update_network_security_groups(self, update_network_security_groups_details, "loadBalancerId": load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7065,7 +7064,7 @@ def update_network_security_groups(self, update_network_security_groups_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7179,7 +7178,7 @@ def update_path_route_set(self, update_path_route_set_details, load_balancer_id, "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_path_route_set got unknown kwargs: {extra_kwargs!r}") @@ -7189,10 +7188,10 @@ def update_path_route_set(self, update_path_route_set_details, load_balancer_id, "pathRouteSetName": path_route_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7202,7 +7201,7 @@ def update_path_route_set(self, update_path_route_set_details, load_balancer_id, "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7314,7 +7313,7 @@ def update_routing_policy(self, update_routing_policy_details, load_balancer_id, "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_routing_policy got unknown kwargs: {extra_kwargs!r}") @@ -7324,10 +7323,10 @@ def update_routing_policy(self, update_routing_policy_details, load_balancer_id, "routingPolicyName": routing_policy_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7337,7 +7336,7 @@ def update_routing_policy(self, update_routing_policy_details, load_balancer_id, "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7449,7 +7448,7 @@ def update_rule_set(self, load_balancer_id, rule_set_name, update_rule_set_detai "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rule_set got unknown kwargs: {extra_kwargs!r}") @@ -7459,10 +7458,10 @@ def update_rule_set(self, load_balancer_id, rule_set_name, update_rule_set_detai "ruleSetName": rule_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7472,7 +7471,7 @@ def update_rule_set(self, load_balancer_id, rule_set_name, update_rule_set_detai "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7581,7 +7580,7 @@ def update_ssl_cipher_suite(self, update_ssl_cipher_suite_details, load_balancer "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ssl_cipher_suite got unknown kwargs: {extra_kwargs!r}") @@ -7591,10 +7590,10 @@ def update_ssl_cipher_suite(self, update_ssl_cipher_suite_details, load_balancer "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7604,7 +7603,7 @@ def update_ssl_cipher_suite(self, update_ssl_cipher_suite_details, load_balancer "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/lockbox/lockbox_client.py b/src/oci/lockbox/lockbox_client.py index ffe6e458f4..b55319a040 100644 --- a/src/oci/lockbox/lockbox_client.py +++ b/src/oci/lockbox/lockbox_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -282,7 +281,7 @@ def change_approval_template_compartment(self, approval_template_id, change_appr "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_approval_template_compartment got unknown kwargs: {extra_kwargs!r}") @@ -291,10 +290,10 @@ def change_approval_template_compartment(self, approval_template_id, change_appr "approvalTemplateId": approval_template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -304,7 +303,7 @@ def change_approval_template_compartment(self, approval_template_id, change_appr "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -400,7 +399,7 @@ def change_lockbox_compartment(self, lockbox_id, change_lockbox_compartment_deta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_lockbox_compartment got unknown kwargs: {extra_kwargs!r}") @@ -409,10 +408,10 @@ def change_lockbox_compartment(self, lockbox_id, change_lockbox_compartment_deta "lockboxId": lockbox_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -422,7 +421,7 @@ def change_lockbox_compartment(self, lockbox_id, change_lockbox_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -507,7 +506,7 @@ def create_access_request(self, create_access_request_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_access_request got unknown kwargs: {extra_kwargs!r}") @@ -518,7 +517,7 @@ def create_access_request(self, create_access_request_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -603,7 +602,7 @@ def create_approval_template(self, create_approval_template_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_approval_template got unknown kwargs: {extra_kwargs!r}") @@ -614,7 +613,7 @@ def create_approval_template(self, create_approval_template_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -699,7 +698,7 @@ def create_lockbox(self, create_lockbox_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_lockbox got unknown kwargs: {extra_kwargs!r}") @@ -710,7 +709,7 @@ def create_lockbox(self, create_lockbox_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -795,7 +794,7 @@ def delete_approval_template(self, approval_template_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_approval_template got unknown kwargs: {extra_kwargs!r}") @@ -804,10 +803,10 @@ def delete_approval_template(self, approval_template_id, **kwargs): "approvalTemplateId": approval_template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -816,7 +815,7 @@ def delete_approval_template(self, approval_template_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -906,7 +905,7 @@ def delete_lockbox(self, lockbox_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_lockbox got unknown kwargs: {extra_kwargs!r}") @@ -915,10 +914,10 @@ def delete_lockbox(self, lockbox_id, **kwargs): "lockboxId": lockbox_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -928,7 +927,7 @@ def delete_lockbox(self, lockbox_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1050,7 +1049,7 @@ def export_access_requests(self, export_access_requests_details, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_access_requests got unknown kwargs: {extra_kwargs!r}") @@ -1095,14 +1094,14 @@ def export_access_requests(self, export_access_requests_details, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "text/csv", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1180,7 +1179,7 @@ def get_access_materials(self, access_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_access_materials got unknown kwargs: {extra_kwargs!r}") @@ -1189,10 +1188,10 @@ def get_access_materials(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1200,7 +1199,7 @@ def get_access_materials(self, access_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1276,7 +1275,7 @@ def get_access_request(self, access_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_access_request got unknown kwargs: {extra_kwargs!r}") @@ -1285,10 +1284,10 @@ def get_access_request(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1296,7 +1295,7 @@ def get_access_request(self, access_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1372,7 +1371,7 @@ def get_approval_template(self, approval_template_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_approval_template got unknown kwargs: {extra_kwargs!r}") @@ -1381,10 +1380,10 @@ def get_approval_template(self, approval_template_id, **kwargs): "approvalTemplateId": approval_template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1392,7 +1391,7 @@ def get_approval_template(self, approval_template_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1468,7 +1467,7 @@ def get_lockbox(self, lockbox_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lockbox got unknown kwargs: {extra_kwargs!r}") @@ -1477,10 +1476,10 @@ def get_lockbox(self, lockbox_id, **kwargs): "lockboxId": lockbox_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1488,7 +1487,7 @@ def get_lockbox(self, lockbox_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1564,7 +1563,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1573,10 +1572,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1584,7 +1583,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1679,7 +1678,7 @@ def handle_access_request(self, access_request_id, handle_access_request_details "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"handle_access_request got unknown kwargs: {extra_kwargs!r}") @@ -1688,10 +1687,10 @@ def handle_access_request(self, access_request_id, handle_access_request_details "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1701,7 +1700,7 @@ def handle_access_request(self, access_request_id, handle_access_request_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1839,7 +1838,7 @@ def list_access_requests(self, **kwargs): "time_created_after", "time_created_before" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_access_requests got unknown kwargs: {extra_kwargs!r}") @@ -1887,14 +1886,14 @@ def list_access_requests(self, **kwargs): "timeCreatedAfter": kwargs.get("time_created_after", missing), "timeCreatedBefore": kwargs.get("time_created_before", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2005,7 +2004,7 @@ def list_approval_templates(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_approval_templates got unknown kwargs: {extra_kwargs!r}") @@ -2041,14 +2040,14 @@ def list_approval_templates(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2173,7 +2172,7 @@ def list_lockboxes(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_lockboxes got unknown kwargs: {extra_kwargs!r}") @@ -2219,14 +2218,14 @@ def list_lockboxes(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2322,7 +2321,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2331,10 +2330,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2357,14 +2356,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2462,7 +2461,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2471,10 +2470,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2497,14 +2496,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2617,7 +2616,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2653,14 +2652,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2747,7 +2746,7 @@ def update_approval_template(self, approval_template_id, update_approval_templat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_approval_template got unknown kwargs: {extra_kwargs!r}") @@ -2756,10 +2755,10 @@ def update_approval_template(self, approval_template_id, update_approval_templat "approvalTemplateId": approval_template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2768,7 +2767,7 @@ def update_approval_template(self, approval_template_id, update_approval_templat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2857,7 +2856,7 @@ def update_lockbox(self, lockbox_id, update_lockbox_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_lockbox got unknown kwargs: {extra_kwargs!r}") @@ -2866,10 +2865,10 @@ def update_lockbox(self, lockbox_id, update_lockbox_details, **kwargs): "lockboxId": lockbox_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2878,7 +2877,7 @@ def update_lockbox(self, lockbox_id, update_lockbox_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/log_analytics/log_analytics_client.py b/src/oci/log_analytics/log_analytics_client.py index 6a438d68b0..c3254ac5f7 100644 --- a/src/oci/log_analytics/log_analytics_client.py +++ b/src/oci/log_analytics/log_analytics_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def add_entity_association(self, namespace_name, log_analytics_entity_id, add_en "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_entity_association got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def add_entity_association(self, namespace_name, log_analytics_entity_id, add_en "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -204,7 +203,7 @@ def add_entity_association(self, namespace_name, log_analytics_entity_id, add_en "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -301,7 +300,7 @@ def add_source_event_types(self, namespace_name, source_name, add_event_type_det "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_source_event_types got unknown kwargs: {extra_kwargs!r}") @@ -311,10 +310,10 @@ def add_source_event_types(self, namespace_name, source_name, add_event_type_det "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -323,7 +322,7 @@ def add_source_event_types(self, namespace_name, source_name, add_event_type_det "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -450,7 +449,7 @@ def append_lookup_data(self, namespace_name, lookup_name, append_lookup_file_bod "if_match", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"append_lookup_data got unknown kwargs: {extra_kwargs!r}") @@ -460,17 +459,17 @@ def append_lookup_data(self, namespace_name, lookup_name, append_lookup_file_bod "lookupName": lookup_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isForce": kwargs.get("is_force", missing), "charEncoding": kwargs.get("char_encoding", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -479,7 +478,7 @@ def append_lookup_data(self, namespace_name, lookup_name, append_lookup_file_bod "if-match": kwargs.get("if_match", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -492,7 +491,7 @@ def append_lookup_data(self, namespace_name, lookup_name, append_lookup_file_bod append_lookup_file_body = kwargs.get("append_lookup_file_body", missing) if append_lookup_file_body is not missing and append_lookup_file_body is not None: - if (not isinstance(append_lookup_file_body, (six.binary_type, six.string_types)) and + if (not isinstance(append_lookup_file_body, (bytes, str)) and not hasattr(append_lookup_file_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -604,7 +603,7 @@ def assign_encryption_key(self, namespace_name, assign_encryption_key_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"assign_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -613,10 +612,10 @@ def assign_encryption_key(self, namespace_name, assign_encryption_key_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -626,7 +625,7 @@ def assign_encryption_key(self, namespace_name, assign_encryption_key_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -733,7 +732,7 @@ def batch_get_basic_info(self, namespace_name, basic_details, is_include_deleted "basic_label_sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"batch_get_basic_info got unknown kwargs: {extra_kwargs!r}") @@ -742,10 +741,10 @@ def batch_get_basic_info(self, namespace_name, basic_details, is_include_deleted "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -769,14 +768,14 @@ def batch_get_basic_info(self, namespace_name, basic_details, is_include_deleted "sortOrder": kwargs.get("sort_order", missing), "basicLabelSortBy": kwargs.get("basic_label_sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -875,7 +874,7 @@ def cancel_query_work_request(self, namespace_name, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_query_work_request got unknown kwargs: {extra_kwargs!r}") @@ -885,10 +884,10 @@ def cancel_query_work_request(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -897,7 +896,7 @@ def cancel_query_work_request(self, namespace_name, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -995,7 +994,7 @@ def change_ingest_time_rule_compartment(self, namespace_name, ingest_time_rule_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ingest_time_rule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1005,10 +1004,10 @@ def change_ingest_time_rule_compartment(self, namespace_name, ingest_time_rule_i "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1018,7 +1017,7 @@ def change_ingest_time_rule_compartment(self, namespace_name, ingest_time_rule_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1123,7 +1122,7 @@ def change_log_analytics_em_bridge_compartment(self, namespace_name, log_analyti "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_analytics_em_bridge_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1133,10 +1132,10 @@ def change_log_analytics_em_bridge_compartment(self, namespace_name, log_analyti "logAnalyticsEmBridgeId": log_analytics_em_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1146,7 +1145,7 @@ def change_log_analytics_em_bridge_compartment(self, namespace_name, log_analyti "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1251,7 +1250,7 @@ def change_log_analytics_entity_compartment(self, namespace_name, log_analytics_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_analytics_entity_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1261,10 +1260,10 @@ def change_log_analytics_entity_compartment(self, namespace_name, log_analytics_ "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1274,7 +1273,7 @@ def change_log_analytics_entity_compartment(self, namespace_name, log_analytics_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1379,7 +1378,7 @@ def change_log_analytics_log_group_compartment(self, namespace_name, log_analyti "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_analytics_log_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1389,10 +1388,10 @@ def change_log_analytics_log_group_compartment(self, namespace_name, log_analyti "logAnalyticsLogGroupId": log_analytics_log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1402,7 +1401,7 @@ def change_log_analytics_log_group_compartment(self, namespace_name, log_analyti "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1501,7 +1500,7 @@ def change_log_analytics_object_collection_rule_compartment(self, namespace_name "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_analytics_object_collection_rule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1511,10 +1510,10 @@ def change_log_analytics_object_collection_rule_compartment(self, namespace_name "logAnalyticsObjectCollectionRuleId": log_analytics_object_collection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1523,7 +1522,7 @@ def change_log_analytics_object_collection_rule_compartment(self, namespace_name "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1626,7 +1625,7 @@ def change_scheduled_task_compartment(self, namespace_name, scheduled_task_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_scheduled_task_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1636,10 +1635,10 @@ def change_scheduled_task_compartment(self, namespace_name, scheduled_task_id, c "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1649,7 +1648,7 @@ def change_scheduled_task_compartment(self, namespace_name, scheduled_task_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1753,7 +1752,7 @@ def clean(self, namespace_name, scheduled_task_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clean got unknown kwargs: {extra_kwargs!r}") @@ -1763,17 +1762,17 @@ def clean(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1781,7 +1780,7 @@ def clean(self, namespace_name, scheduled_task_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1863,7 +1862,7 @@ def compare_content(self, namespace_name, compare_content_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"compare_content got unknown kwargs: {extra_kwargs!r}") @@ -1872,10 +1871,10 @@ def compare_content(self, namespace_name, compare_content_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1883,7 +1882,7 @@ def compare_content(self, namespace_name, compare_content_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -1978,7 +1977,7 @@ def create_ingest_time_rule(self, namespace_name, create_ingest_time_rule_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -1987,10 +1986,10 @@ def create_ingest_time_rule(self, namespace_name, create_ingest_time_rule_detail "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1999,7 +1998,7 @@ def create_ingest_time_rule(self, namespace_name, create_ingest_time_rule_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2095,7 +2094,7 @@ def create_log_analytics_em_bridge(self, namespace_name, create_log_analytics_em "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_analytics_em_bridge got unknown kwargs: {extra_kwargs!r}") @@ -2104,10 +2103,10 @@ def create_log_analytics_em_bridge(self, namespace_name, create_log_analytics_em "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2116,7 +2115,7 @@ def create_log_analytics_em_bridge(self, namespace_name, create_log_analytics_em "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2212,7 +2211,7 @@ def create_log_analytics_entity(self, namespace_name, create_log_analytics_entit "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_analytics_entity got unknown kwargs: {extra_kwargs!r}") @@ -2221,10 +2220,10 @@ def create_log_analytics_entity(self, namespace_name, create_log_analytics_entit "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2233,7 +2232,7 @@ def create_log_analytics_entity(self, namespace_name, create_log_analytics_entit "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2329,7 +2328,7 @@ def create_log_analytics_entity_type(self, namespace_name, create_log_analytics_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_analytics_entity_type got unknown kwargs: {extra_kwargs!r}") @@ -2338,10 +2337,10 @@ def create_log_analytics_entity_type(self, namespace_name, create_log_analytics_ "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2350,7 +2349,7 @@ def create_log_analytics_entity_type(self, namespace_name, create_log_analytics_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2444,7 +2443,7 @@ def create_log_analytics_log_group(self, namespace_name, create_log_analytics_lo "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_analytics_log_group got unknown kwargs: {extra_kwargs!r}") @@ -2453,10 +2452,10 @@ def create_log_analytics_log_group(self, namespace_name, create_log_analytics_lo "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2465,7 +2464,7 @@ def create_log_analytics_log_group(self, namespace_name, create_log_analytics_lo "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2553,7 +2552,7 @@ def create_log_analytics_object_collection_rule(self, namespace_name, create_log "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_analytics_object_collection_rule got unknown kwargs: {extra_kwargs!r}") @@ -2562,10 +2561,10 @@ def create_log_analytics_object_collection_rule(self, namespace_name, create_log "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2573,7 +2572,7 @@ def create_log_analytics_object_collection_rule(self, namespace_name, create_log "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2666,7 +2665,7 @@ def create_scheduled_task(self, namespace_name, create_scheduled_task_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -2675,10 +2674,10 @@ def create_scheduled_task(self, namespace_name, create_scheduled_task_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2687,7 +2686,7 @@ def create_scheduled_task(self, namespace_name, create_scheduled_task_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2781,7 +2780,7 @@ def delete_associations(self, namespace_name, delete_log_analytics_association_d "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_associations got unknown kwargs: {extra_kwargs!r}") @@ -2790,10 +2789,10 @@ def delete_associations(self, namespace_name, delete_log_analytics_association_d "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2802,7 +2801,7 @@ def delete_associations(self, namespace_name, delete_log_analytics_association_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -2904,7 +2903,7 @@ def delete_field(self, namespace_name, field_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_field got unknown kwargs: {extra_kwargs!r}") @@ -2914,10 +2913,10 @@ def delete_field(self, namespace_name, field_name, **kwargs): "fieldName": field_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2927,7 +2926,7 @@ def delete_field(self, namespace_name, field_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3015,7 +3014,7 @@ def delete_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -3025,10 +3024,10 @@ def delete_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3037,7 +3036,7 @@ def delete_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3132,7 +3131,7 @@ def delete_label(self, namespace_name, label_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_label got unknown kwargs: {extra_kwargs!r}") @@ -3142,10 +3141,10 @@ def delete_label(self, namespace_name, label_name, **kwargs): "labelName": label_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3155,7 +3154,7 @@ def delete_label(self, namespace_name, label_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3247,7 +3246,7 @@ def delete_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "opc_request_id", "is_delete_entities" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_analytics_em_bridge got unknown kwargs: {extra_kwargs!r}") @@ -3257,16 +3256,16 @@ def delete_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "logAnalyticsEmBridgeId": log_analytics_em_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isDeleteEntities": kwargs.get("is_delete_entities", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3274,7 +3273,7 @@ def delete_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3361,7 +3360,7 @@ def delete_log_analytics_entity(self, namespace_name, log_analytics_entity_id, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_analytics_entity got unknown kwargs: {extra_kwargs!r}") @@ -3371,10 +3370,10 @@ def delete_log_analytics_entity(self, namespace_name, log_analytics_entity_id, * "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3383,7 +3382,7 @@ def delete_log_analytics_entity(self, namespace_name, log_analytics_entity_id, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3468,7 +3467,7 @@ def delete_log_analytics_entity_type(self, namespace_name, entity_type_name, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_analytics_entity_type got unknown kwargs: {extra_kwargs!r}") @@ -3478,10 +3477,10 @@ def delete_log_analytics_entity_type(self, namespace_name, entity_type_name, **k "entityTypeName": entity_type_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3490,7 +3489,7 @@ def delete_log_analytics_entity_type(self, namespace_name, entity_type_name, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3575,7 +3574,7 @@ def delete_log_analytics_log_group(self, namespace_name, log_analytics_log_group "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_analytics_log_group got unknown kwargs: {extra_kwargs!r}") @@ -3585,10 +3584,10 @@ def delete_log_analytics_log_group(self, namespace_name, log_analytics_log_group "logAnalyticsLogGroupId": log_analytics_log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3597,7 +3596,7 @@ def delete_log_analytics_log_group(self, namespace_name, log_analytics_log_group "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3687,7 +3686,7 @@ def delete_log_analytics_object_collection_rule(self, namespace_name, log_analyt "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_analytics_object_collection_rule got unknown kwargs: {extra_kwargs!r}") @@ -3697,10 +3696,10 @@ def delete_log_analytics_object_collection_rule(self, namespace_name, log_analyt "logAnalyticsObjectCollectionRuleId": log_analytics_object_collection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3709,7 +3708,7 @@ def delete_log_analytics_object_collection_rule(self, namespace_name, log_analyt "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3806,7 +3805,7 @@ def delete_lookup(self, namespace_name, lookup_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_lookup got unknown kwargs: {extra_kwargs!r}") @@ -3816,16 +3815,16 @@ def delete_lookup(self, namespace_name, lookup_name, **kwargs): "lookupName": lookup_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isForce": kwargs.get("is_force", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3834,7 +3833,7 @@ def delete_lookup(self, namespace_name, lookup_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3932,7 +3931,7 @@ def delete_parser(self, namespace_name, parser_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_parser got unknown kwargs: {extra_kwargs!r}") @@ -3942,10 +3941,10 @@ def delete_parser(self, namespace_name, parser_name, **kwargs): "parserName": parser_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3955,7 +3954,7 @@ def delete_parser(self, namespace_name, parser_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4044,7 +4043,7 @@ def delete_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -4054,10 +4053,10 @@ def delete_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4066,7 +4065,7 @@ def delete_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4161,7 +4160,7 @@ def delete_source(self, namespace_name, source_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_source got unknown kwargs: {extra_kwargs!r}") @@ -4171,10 +4170,10 @@ def delete_source(self, namespace_name, source_name, **kwargs): "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4184,7 +4183,7 @@ def delete_source(self, namespace_name, source_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4273,7 +4272,7 @@ def delete_upload(self, namespace_name, upload_reference, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_upload got unknown kwargs: {extra_kwargs!r}") @@ -4283,10 +4282,10 @@ def delete_upload(self, namespace_name, upload_reference, **kwargs): "uploadReference": upload_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4295,7 +4294,7 @@ def delete_upload(self, namespace_name, upload_reference, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4376,7 +4375,7 @@ def delete_upload_file(self, namespace_name, upload_reference, file_reference, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_upload_file got unknown kwargs: {extra_kwargs!r}") @@ -4387,10 +4386,10 @@ def delete_upload_file(self, namespace_name, upload_reference, file_reference, * "fileReference": file_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4398,7 +4397,7 @@ def delete_upload_file(self, namespace_name, upload_reference, file_reference, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4478,7 +4477,7 @@ def delete_upload_warning(self, namespace_name, upload_reference, warning_refere "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_upload_warning got unknown kwargs: {extra_kwargs!r}") @@ -4489,10 +4488,10 @@ def delete_upload_warning(self, namespace_name, upload_reference, warning_refere "warningReference": warning_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4500,7 +4499,7 @@ def delete_upload_warning(self, namespace_name, upload_reference, warning_refere "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4582,7 +4581,7 @@ def disable_archiving(self, namespace_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_archiving got unknown kwargs: {extra_kwargs!r}") @@ -4591,10 +4590,10 @@ def disable_archiving(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4603,7 +4602,7 @@ def disable_archiving(self, namespace_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4697,7 +4696,7 @@ def disable_auto_association(self, namespace_name, source_name, disable_auto_ass "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_auto_association got unknown kwargs: {extra_kwargs!r}") @@ -4707,10 +4706,10 @@ def disable_auto_association(self, namespace_name, source_name, disable_auto_ass "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4719,7 +4718,7 @@ def disable_auto_association(self, namespace_name, source_name, disable_auto_ass "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -4813,7 +4812,7 @@ def disable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -4823,10 +4822,10 @@ def disable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4835,7 +4834,7 @@ def disable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4925,7 +4924,7 @@ def disable_source_event_types(self, namespace_name, source_name, disable_event_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_source_event_types got unknown kwargs: {extra_kwargs!r}") @@ -4935,10 +4934,10 @@ def disable_source_event_types(self, namespace_name, source_name, disable_event_ "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4947,7 +4946,7 @@ def disable_source_event_types(self, namespace_name, source_name, disable_event_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5038,7 +5037,7 @@ def enable_archiving(self, namespace_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_archiving got unknown kwargs: {extra_kwargs!r}") @@ -5047,10 +5046,10 @@ def enable_archiving(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5059,7 +5058,7 @@ def enable_archiving(self, namespace_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5153,7 +5152,7 @@ def enable_auto_association(self, namespace_name, source_name, enable_auto_assoc "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_auto_association got unknown kwargs: {extra_kwargs!r}") @@ -5163,10 +5162,10 @@ def enable_auto_association(self, namespace_name, source_name, enable_auto_assoc "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5175,7 +5174,7 @@ def enable_auto_association(self, namespace_name, source_name, enable_auto_assoc "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5269,7 +5268,7 @@ def enable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -5279,10 +5278,10 @@ def enable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5291,7 +5290,7 @@ def enable_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5381,7 +5380,7 @@ def enable_source_event_types(self, namespace_name, source_name, enable_event_ty "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_source_event_types got unknown kwargs: {extra_kwargs!r}") @@ -5391,10 +5390,10 @@ def enable_source_event_types(self, namespace_name, source_name, enable_event_ty "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5403,7 +5402,7 @@ def enable_source_event_types(self, namespace_name, source_name, enable_event_ty "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5505,7 +5504,7 @@ def estimate_purge_data_size(self, namespace_name, estimate_purge_data_size_deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"estimate_purge_data_size got unknown kwargs: {extra_kwargs!r}") @@ -5514,10 +5513,10 @@ def estimate_purge_data_size(self, namespace_name, estimate_purge_data_size_deta "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5527,7 +5526,7 @@ def estimate_purge_data_size(self, namespace_name, estimate_purge_data_size_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5615,7 +5614,7 @@ def estimate_recall_data_size(self, namespace_name, estimate_recall_data_size_de "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"estimate_recall_data_size got unknown kwargs: {extra_kwargs!r}") @@ -5624,10 +5623,10 @@ def estimate_recall_data_size(self, namespace_name, estimate_recall_data_size_de "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5635,7 +5634,7 @@ def estimate_recall_data_size(self, namespace_name, estimate_recall_data_size_de "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5722,7 +5721,7 @@ def estimate_release_data_size(self, namespace_name, estimate_release_data_size_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"estimate_release_data_size got unknown kwargs: {extra_kwargs!r}") @@ -5731,10 +5730,10 @@ def estimate_release_data_size(self, namespace_name, estimate_release_data_size_ "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5742,7 +5741,7 @@ def estimate_release_data_size(self, namespace_name, estimate_release_data_size_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5837,7 +5836,7 @@ def export_custom_content(self, namespace_name, export_custom_content_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_custom_content got unknown kwargs: {extra_kwargs!r}") @@ -5846,10 +5845,10 @@ def export_custom_content(self, namespace_name, export_custom_content_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5858,7 +5857,7 @@ def export_custom_content(self, namespace_name, export_custom_content_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5946,7 +5945,7 @@ def export_query_result(self, namespace_name, export_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_query_result got unknown kwargs: {extra_kwargs!r}") @@ -5955,10 +5954,10 @@ def export_query_result(self, namespace_name, export_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5966,7 +5965,7 @@ def export_query_result(self, namespace_name, export_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -6067,7 +6066,7 @@ def extract_structured_log_field_paths(self, namespace_name, logan_parser_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"extract_structured_log_field_paths got unknown kwargs: {extra_kwargs!r}") @@ -6076,10 +6075,10 @@ def extract_structured_log_field_paths(self, namespace_name, logan_parser_detail "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'parser_type' in kwargs: @@ -6092,7 +6091,7 @@ def extract_structured_log_field_paths(self, namespace_name, logan_parser_detail query_params = { "parserType": kwargs.get("parser_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", @@ -6100,7 +6099,7 @@ def extract_structured_log_field_paths(self, namespace_name, logan_parser_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -6204,7 +6203,7 @@ def extract_structured_log_header_paths(self, namespace_name, logan_parser_detai "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"extract_structured_log_header_paths got unknown kwargs: {extra_kwargs!r}") @@ -6213,10 +6212,10 @@ def extract_structured_log_header_paths(self, namespace_name, logan_parser_detai "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'parser_type' in kwargs: @@ -6229,7 +6228,7 @@ def extract_structured_log_header_paths(self, namespace_name, logan_parser_detai query_params = { "parserType": kwargs.get("parser_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", @@ -6237,7 +6236,7 @@ def extract_structured_log_header_paths(self, namespace_name, logan_parser_detai "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -6327,7 +6326,7 @@ def filter(self, namespace_name, filter_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"filter got unknown kwargs: {extra_kwargs!r}") @@ -6336,10 +6335,10 @@ def filter(self, namespace_name, filter_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6347,7 +6346,7 @@ def filter(self, namespace_name, filter_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -6434,7 +6433,7 @@ def get_association_summary(self, namespace_name, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_association_summary got unknown kwargs: {extra_kwargs!r}") @@ -6443,23 +6442,23 @@ def get_association_summary(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6542,7 +6541,7 @@ def get_category(self, namespace_name, category_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_category got unknown kwargs: {extra_kwargs!r}") @@ -6552,10 +6551,10 @@ def get_category(self, namespace_name, category_name, **kwargs): "categoryName": category_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6563,7 +6562,7 @@ def get_category(self, namespace_name, category_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6652,7 +6651,7 @@ def get_column_names(self, namespace_name, sql_query, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_column_names got unknown kwargs: {extra_kwargs!r}") @@ -6661,16 +6660,16 @@ def get_column_names(self, namespace_name, sql_query, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "sqlQuery": sql_query } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6678,7 +6677,7 @@ def get_column_names(self, namespace_name, sql_query, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6764,7 +6763,7 @@ def get_config_work_request(self, namespace_name, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_config_work_request got unknown kwargs: {extra_kwargs!r}") @@ -6774,10 +6773,10 @@ def get_config_work_request(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6785,7 +6784,7 @@ def get_config_work_request(self, namespace_name, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6866,7 +6865,7 @@ def get_field(self, namespace_name, field_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_field got unknown kwargs: {extra_kwargs!r}") @@ -6876,10 +6875,10 @@ def get_field(self, namespace_name, field_name, **kwargs): "fieldName": field_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6887,7 +6886,7 @@ def get_field(self, namespace_name, field_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6969,7 +6968,7 @@ def get_fields_summary(self, namespace_name, **kwargs): "is_show_detail", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_fields_summary got unknown kwargs: {extra_kwargs!r}") @@ -6978,23 +6977,23 @@ def get_fields_summary(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isShowDetail": kwargs.get("is_show_detail", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7077,7 +7076,7 @@ def get_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -7087,10 +7086,10 @@ def get_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs): "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7098,7 +7097,7 @@ def get_ingest_time_rule(self, namespace_name, ingest_time_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7179,7 +7178,7 @@ def get_label(self, namespace_name, label_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_label got unknown kwargs: {extra_kwargs!r}") @@ -7189,10 +7188,10 @@ def get_label(self, namespace_name, label_name, **kwargs): "labelName": label_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7200,7 +7199,7 @@ def get_label(self, namespace_name, label_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7278,7 +7277,7 @@ def get_label_summary(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_label_summary got unknown kwargs: {extra_kwargs!r}") @@ -7287,10 +7286,10 @@ def get_label_summary(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7298,7 +7297,7 @@ def get_label_summary(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7379,7 +7378,7 @@ def get_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_em_bridge got unknown kwargs: {extra_kwargs!r}") @@ -7389,10 +7388,10 @@ def get_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge_id "logAnalyticsEmBridgeId": log_analytics_em_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7400,7 +7399,7 @@ def get_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7479,7 +7478,7 @@ def get_log_analytics_em_bridge_summary(self, namespace_name, compartment_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_em_bridge_summary got unknown kwargs: {extra_kwargs!r}") @@ -7488,23 +7487,23 @@ def get_log_analytics_em_bridge_summary(self, namespace_name, compartment_id, ** "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7585,7 +7584,7 @@ def get_log_analytics_entities_summary(self, namespace_name, compartment_id, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_entities_summary got unknown kwargs: {extra_kwargs!r}") @@ -7594,23 +7593,23 @@ def get_log_analytics_entities_summary(self, namespace_name, compartment_id, **k "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7691,7 +7690,7 @@ def get_log_analytics_entity(self, namespace_name, log_analytics_entity_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_entity got unknown kwargs: {extra_kwargs!r}") @@ -7701,10 +7700,10 @@ def get_log_analytics_entity(self, namespace_name, log_analytics_entity_id, **kw "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7712,7 +7711,7 @@ def get_log_analytics_entity(self, namespace_name, log_analytics_entity_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7791,7 +7790,7 @@ def get_log_analytics_entity_type(self, namespace_name, entity_type_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_entity_type got unknown kwargs: {extra_kwargs!r}") @@ -7801,10 +7800,10 @@ def get_log_analytics_entity_type(self, namespace_name, entity_type_name, **kwar "entityTypeName": entity_type_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7812,7 +7811,7 @@ def get_log_analytics_entity_type(self, namespace_name, entity_type_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7891,7 +7890,7 @@ def get_log_analytics_log_group(self, namespace_name, log_analytics_log_group_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_log_group got unknown kwargs: {extra_kwargs!r}") @@ -7901,10 +7900,10 @@ def get_log_analytics_log_group(self, namespace_name, log_analytics_log_group_id "logAnalyticsLogGroupId": log_analytics_log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7912,7 +7911,7 @@ def get_log_analytics_log_group(self, namespace_name, log_analytics_log_group_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7993,7 +7992,7 @@ def get_log_analytics_log_groups_summary(self, namespace_name, compartment_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_log_groups_summary got unknown kwargs: {extra_kwargs!r}") @@ -8002,23 +8001,23 @@ def get_log_analytics_log_groups_summary(self, namespace_name, compartment_id, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8103,7 +8102,7 @@ def get_log_analytics_object_collection_rule(self, namespace_name, log_analytics "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_analytics_object_collection_rule got unknown kwargs: {extra_kwargs!r}") @@ -8113,10 +8112,10 @@ def get_log_analytics_object_collection_rule(self, namespace_name, log_analytics "logAnalyticsObjectCollectionRuleId": log_analytics_object_collection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8124,7 +8123,7 @@ def get_log_analytics_object_collection_rule(self, namespace_name, log_analytics "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8202,7 +8201,7 @@ def get_log_sets_count(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_sets_count got unknown kwargs: {extra_kwargs!r}") @@ -8211,10 +8210,10 @@ def get_log_sets_count(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8222,7 +8221,7 @@ def get_log_sets_count(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8303,7 +8302,7 @@ def get_lookup(self, namespace_name, lookup_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lookup got unknown kwargs: {extra_kwargs!r}") @@ -8313,10 +8312,10 @@ def get_lookup(self, namespace_name, lookup_name, **kwargs): "lookupName": lookup_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8324,7 +8323,7 @@ def get_lookup(self, namespace_name, lookup_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8402,7 +8401,7 @@ def get_lookup_summary(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lookup_summary got unknown kwargs: {extra_kwargs!r}") @@ -8411,10 +8410,10 @@ def get_lookup_summary(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8422,7 +8421,7 @@ def get_lookup_summary(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8500,7 +8499,7 @@ def get_namespace(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_namespace got unknown kwargs: {extra_kwargs!r}") @@ -8509,10 +8508,10 @@ def get_namespace(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8520,7 +8519,7 @@ def get_namespace(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8601,7 +8600,7 @@ def get_parser(self, namespace_name, parser_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_parser got unknown kwargs: {extra_kwargs!r}") @@ -8611,10 +8610,10 @@ def get_parser(self, namespace_name, parser_name, **kwargs): "parserName": parser_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8622,7 +8621,7 @@ def get_parser(self, namespace_name, parser_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8700,7 +8699,7 @@ def get_parser_summary(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_parser_summary got unknown kwargs: {extra_kwargs!r}") @@ -8709,10 +8708,10 @@ def get_parser_summary(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8720,7 +8719,7 @@ def get_parser_summary(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8818,7 +8817,7 @@ def get_preferences(self, namespace_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_preferences got unknown kwargs: {extra_kwargs!r}") @@ -8827,10 +8826,10 @@ def get_preferences(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -8853,14 +8852,14 @@ def get_preferences(self, namespace_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8968,7 +8967,7 @@ def get_query_result(self, namespace_name, work_request_id, **kwargs): "should_include_fields", "output_mode" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_query_result got unknown kwargs: {extra_kwargs!r}") @@ -8977,10 +8976,10 @@ def get_query_result(self, namespace_name, work_request_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'output_mode' in kwargs: @@ -8998,14 +8997,14 @@ def get_query_result(self, namespace_name, work_request_id, **kwargs): "shouldIncludeFields": kwargs.get("should_include_fields", missing), "outputMode": kwargs.get("output_mode", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9090,7 +9089,7 @@ def get_query_work_request(self, namespace_name, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_query_work_request got unknown kwargs: {extra_kwargs!r}") @@ -9100,10 +9099,10 @@ def get_query_work_request(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9111,7 +9110,7 @@ def get_query_work_request(self, namespace_name, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9189,7 +9188,7 @@ def get_recall_count(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_recall_count got unknown kwargs: {extra_kwargs!r}") @@ -9198,10 +9197,10 @@ def get_recall_count(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9209,7 +9208,7 @@ def get_recall_count(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9295,7 +9294,7 @@ def get_recalled_data_size(self, namespace_name, **kwargs): "time_data_started", "time_data_ended" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_recalled_data_size got unknown kwargs: {extra_kwargs!r}") @@ -9304,24 +9303,24 @@ def get_recalled_data_size(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "timeDataStarted": kwargs.get("time_data_started", missing), "timeDataEnded": kwargs.get("time_data_ended", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9404,7 +9403,7 @@ def get_rules_summary(self, namespace_name, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rules_summary got unknown kwargs: {extra_kwargs!r}") @@ -9413,23 +9412,23 @@ def get_rules_summary(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9513,7 +9512,7 @@ def get_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -9523,10 +9522,10 @@ def get_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9534,7 +9533,7 @@ def get_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9618,7 +9617,7 @@ def get_source(self, namespace_name, source_name, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_source got unknown kwargs: {extra_kwargs!r}") @@ -9628,23 +9627,23 @@ def get_source(self, namespace_name, source_name, compartment_id, **kwargs): "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9724,7 +9723,7 @@ def get_source_summary(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_source_summary got unknown kwargs: {extra_kwargs!r}") @@ -9733,10 +9732,10 @@ def get_source_summary(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9744,7 +9743,7 @@ def get_source_summary(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9822,7 +9821,7 @@ def get_storage(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_storage got unknown kwargs: {extra_kwargs!r}") @@ -9831,10 +9830,10 @@ def get_storage(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9842,7 +9841,7 @@ def get_storage(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9921,7 +9920,7 @@ def get_storage_usage(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_storage_usage got unknown kwargs: {extra_kwargs!r}") @@ -9930,10 +9929,10 @@ def get_storage_usage(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9941,7 +9940,7 @@ def get_storage_usage(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10025,7 +10024,7 @@ def get_storage_work_request(self, work_request_id, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_storage_work_request got unknown kwargs: {extra_kwargs!r}") @@ -10035,10 +10034,10 @@ def get_storage_work_request(self, work_request_id, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10046,7 +10045,7 @@ def get_storage_work_request(self, work_request_id, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10124,7 +10123,7 @@ def get_unprocessed_data_bucket(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_unprocessed_data_bucket got unknown kwargs: {extra_kwargs!r}") @@ -10133,10 +10132,10 @@ def get_unprocessed_data_bucket(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10144,7 +10143,7 @@ def get_unprocessed_data_bucket(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10225,7 +10224,7 @@ def get_upload(self, namespace_name, upload_reference, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_upload got unknown kwargs: {extra_kwargs!r}") @@ -10235,10 +10234,10 @@ def get_upload(self, namespace_name, upload_reference, **kwargs): "uploadReference": upload_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10246,7 +10245,7 @@ def get_upload(self, namespace_name, upload_reference, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10329,7 +10328,7 @@ def get_work_request(self, namespace_name, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -10339,10 +10338,10 @@ def get_work_request(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10350,7 +10349,7 @@ def get_work_request(self, namespace_name, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10456,7 +10455,7 @@ def import_custom_content(self, namespace_name, import_custom_content_file_body, "opc_request_id", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_custom_content got unknown kwargs: {extra_kwargs!r}") @@ -10465,16 +10464,16 @@ def import_custom_content(self, namespace_name, import_custom_content_file_body, "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isOverwrite": kwargs.get("is_overwrite", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", @@ -10482,7 +10481,7 @@ def import_custom_content(self, namespace_name, import_custom_content_file_body, "opc-request-id": kwargs.get("opc_request_id", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -10495,7 +10494,7 @@ def import_custom_content(self, namespace_name, import_custom_content_file_body, import_custom_content_file_body = kwargs.get("import_custom_content_file_body", missing) if import_custom_content_file_body is not missing and import_custom_content_file_body is not None: - if (not isinstance(import_custom_content_file_body, (six.binary_type, six.string_types)) and + if (not isinstance(import_custom_content_file_body, (bytes, str)) and not hasattr(import_custom_content_file_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -10627,7 +10626,7 @@ def list_associable_entities(self, namespace_name, source_name, compartment_id, "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_associable_entities got unknown kwargs: {extra_kwargs!r}") @@ -10637,10 +10636,10 @@ def list_associable_entities(self, namespace_name, source_name, compartment_id, "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'type' in kwargs: @@ -10673,14 +10672,14 @@ def list_associable_entities(self, namespace_name, source_name, compartment_id, "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10797,7 +10796,7 @@ def list_associated_entities(self, namespace_name, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_associated_entities got unknown kwargs: {extra_kwargs!r}") @@ -10806,10 +10805,10 @@ def list_associated_entities(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10836,14 +10835,14 @@ def list_associated_entities(self, namespace_name, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10946,7 +10945,7 @@ def list_auto_associations(self, namespace_name, source_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_auto_associations got unknown kwargs: {extra_kwargs!r}") @@ -10956,10 +10955,10 @@ def list_auto_associations(self, namespace_name, source_name, **kwargs): "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -10982,14 +10981,14 @@ def list_auto_associations(self, namespace_name, source_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11104,7 +11103,7 @@ def list_categories(self, namespace_name, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_categories got unknown kwargs: {extra_kwargs!r}") @@ -11113,10 +11112,10 @@ def list_categories(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -11142,14 +11141,14 @@ def list_categories(self, namespace_name, **kwargs): "page": kwargs.get("page", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11248,7 +11247,7 @@ def list_config_work_requests(self, namespace_name, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_config_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -11257,10 +11256,10 @@ def list_config_work_requests(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -11284,7 +11283,7 @@ def list_config_work_requests(self, namespace_name, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", @@ -11413,7 +11412,7 @@ def list_effective_properties(self, namespace_name, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_effective_properties got unknown kwargs: {extra_kwargs!r}") @@ -11422,10 +11421,10 @@ def list_effective_properties(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -11454,14 +11453,14 @@ def list_effective_properties(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11541,7 +11540,7 @@ def list_encryption_key_info(self, namespace_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_encryption_key_info got unknown kwargs: {extra_kwargs!r}") @@ -11550,10 +11549,10 @@ def list_encryption_key_info(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -11561,7 +11560,7 @@ def list_encryption_key_info(self, namespace_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11669,7 +11668,7 @@ def list_entity_associations(self, namespace_name, log_analytics_entity_id, **kw "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_entity_associations got unknown kwargs: {extra_kwargs!r}") @@ -11679,10 +11678,10 @@ def list_entity_associations(self, namespace_name, log_analytics_entity_id, **kw "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'direct_or_all_associations' in kwargs: @@ -11713,14 +11712,14 @@ def list_entity_associations(self, namespace_name, log_analytics_entity_id, **kw "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11846,7 +11845,7 @@ def list_entity_source_associations(self, namespace_name, compartment_id, **kwar "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_entity_source_associations got unknown kwargs: {extra_kwargs!r}") @@ -11855,10 +11854,10 @@ def list_entity_source_associations(self, namespace_name, compartment_id, **kwar "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'life_cycle_state' in kwargs: @@ -11894,14 +11893,14 @@ def list_entity_source_associations(self, namespace_name, compartment_id, **kwar "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12044,7 +12043,7 @@ def list_fields(self, namespace_name, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_fields got unknown kwargs: {extra_kwargs!r}") @@ -12053,10 +12052,10 @@ def list_fields(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'parser_type' in kwargs: @@ -12094,14 +12093,14 @@ def list_fields(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12233,7 +12232,7 @@ def list_ingest_time_rules(self, namespace_name, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ingest_time_rules got unknown kwargs: {extra_kwargs!r}") @@ -12242,10 +12241,10 @@ def list_ingest_time_rules(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12288,14 +12287,14 @@ def list_ingest_time_rules(self, namespace_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12383,7 +12382,7 @@ def list_label_priorities(self, namespace_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_label_priorities got unknown kwargs: {extra_kwargs!r}") @@ -12392,24 +12391,24 @@ def list_label_priorities(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12514,7 +12513,7 @@ def list_label_source_details(self, namespace_name, **kwargs): "label_source_sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_label_source_details got unknown kwargs: {extra_kwargs!r}") @@ -12523,10 +12522,10 @@ def list_label_source_details(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -12550,14 +12549,14 @@ def list_label_source_details(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "labelSourceSortBy": kwargs.get("label_source_sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12690,7 +12689,7 @@ def list_labels(self, namespace_name, **kwargs): "label_sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_labels got unknown kwargs: {extra_kwargs!r}") @@ -12699,10 +12698,10 @@ def list_labels(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'is_system' in kwargs: @@ -12745,14 +12744,14 @@ def list_labels(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "labelSortBy": kwargs.get("label_sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12877,7 +12876,7 @@ def list_log_analytics_em_bridges(self, namespace_name, compartment_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_em_bridges got unknown kwargs: {extra_kwargs!r}") @@ -12886,10 +12885,10 @@ def list_log_analytics_em_bridges(self, namespace_name, compartment_id, **kwargs "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -12933,14 +12932,14 @@ def list_log_analytics_em_bridges(self, namespace_name, compartment_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13106,7 +13105,7 @@ def list_log_analytics_entities(self, namespace_name, compartment_id, **kwargs): "opc_request_id", "metadata_equals" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_entities got unknown kwargs: {extra_kwargs!r}") @@ -13115,10 +13114,10 @@ def list_log_analytics_entities(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13177,14 +13176,14 @@ def list_log_analytics_entities(self, namespace_name, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "metadataEquals": self.base_client.generate_collection_format_param(kwargs.get("metadata_equals", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13298,7 +13297,7 @@ def list_log_analytics_entity_topology(self, namespace_name, log_analytics_entit "opc_request_id", "metadata_equals" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_entity_topology got unknown kwargs: {extra_kwargs!r}") @@ -13308,10 +13307,10 @@ def list_log_analytics_entity_topology(self, namespace_name, log_analytics_entit "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13343,14 +13342,14 @@ def list_log_analytics_entity_topology(self, namespace_name, log_analytics_entit "sortBy": kwargs.get("sort_by", missing), "metadataEquals": self.base_client.generate_collection_format_param(kwargs.get("metadata_equals", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13472,7 +13471,7 @@ def list_log_analytics_entity_types(self, namespace_name, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_entity_types got unknown kwargs: {extra_kwargs!r}") @@ -13481,10 +13480,10 @@ def list_log_analytics_entity_types(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'cloud_type' in kwargs: @@ -13525,14 +13524,14 @@ def list_log_analytics_entity_types(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13638,7 +13637,7 @@ def list_log_analytics_log_groups(self, namespace_name, compartment_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_log_groups got unknown kwargs: {extra_kwargs!r}") @@ -13647,10 +13646,10 @@ def list_log_analytics_log_groups(self, namespace_name, compartment_id, **kwargs "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13675,14 +13674,14 @@ def list_log_analytics_log_groups(self, namespace_name, compartment_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13796,7 +13795,7 @@ def list_log_analytics_object_collection_rules(self, namespace_name, compartment "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_analytics_object_collection_rules got unknown kwargs: {extra_kwargs!r}") @@ -13805,10 +13804,10 @@ def list_log_analytics_object_collection_rules(self, namespace_name, compartment "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -13841,14 +13840,14 @@ def list_log_analytics_object_collection_rules(self, namespace_name, compartment "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13946,7 +13945,7 @@ def list_log_sets(self, namespace_name, **kwargs): "sort_order", "log_set_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_sets got unknown kwargs: {extra_kwargs!r}") @@ -13955,10 +13954,10 @@ def list_log_sets(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -13974,14 +13973,14 @@ def list_log_sets(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "logSetNameContains": self.base_client.generate_collection_format_param(kwargs.get("log_set_name_contains", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14113,7 +14112,7 @@ def list_lookups(self, namespace_name, type, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_lookups got unknown kwargs: {extra_kwargs!r}") @@ -14122,10 +14121,10 @@ def list_lookups(self, namespace_name, type, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') type_allowed_values = ["Lookup", "Dictionary", "Module"] @@ -14174,14 +14173,14 @@ def list_lookups(self, namespace_name, type, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14281,7 +14280,7 @@ def list_meta_source_types(self, namespace_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_meta_source_types got unknown kwargs: {extra_kwargs!r}") @@ -14290,10 +14289,10 @@ def list_meta_source_types(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14316,14 +14315,14 @@ def list_meta_source_types(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14404,7 +14403,7 @@ def list_namespaces(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -14412,14 +14411,14 @@ def list_namespaces(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14526,7 +14525,7 @@ def list_overlapping_recalls(self, namespace_name, **kwargs): "time_data_started", "time_data_ended" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_overlapping_recalls got unknown kwargs: {extra_kwargs!r}") @@ -14535,10 +14534,10 @@ def list_overlapping_recalls(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14563,14 +14562,14 @@ def list_overlapping_recalls(self, namespace_name, **kwargs): "timeDataStarted": kwargs.get("time_data_started", missing), "timeDataEnded": kwargs.get("time_data_ended", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14674,7 +14673,7 @@ def list_parser_functions(self, namespace_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_parser_functions got unknown kwargs: {extra_kwargs!r}") @@ -14683,10 +14682,10 @@ def list_parser_functions(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14710,14 +14709,14 @@ def list_parser_functions(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14817,7 +14816,7 @@ def list_parser_meta_plugins(self, namespace_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_parser_meta_plugins got unknown kwargs: {extra_kwargs!r}") @@ -14826,10 +14825,10 @@ def list_parser_meta_plugins(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14852,14 +14851,14 @@ def list_parser_meta_plugins(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15002,7 +15001,7 @@ def list_parsers(self, namespace_name, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_parsers got unknown kwargs: {extra_kwargs!r}") @@ -15011,10 +15010,10 @@ def list_parsers(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'source_type' in kwargs: @@ -15065,14 +15064,14 @@ def list_parsers(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15189,7 +15188,7 @@ def list_properties_metadata(self, namespace_name, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_properties_metadata got unknown kwargs: {extra_kwargs!r}") @@ -15198,10 +15197,10 @@ def list_properties_metadata(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -15228,14 +15227,14 @@ def list_properties_metadata(self, namespace_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15344,7 +15343,7 @@ def list_query_work_requests(self, namespace_name, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_query_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -15353,10 +15352,10 @@ def list_query_work_requests(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'mode' in kwargs: @@ -15388,14 +15387,14 @@ def list_query_work_requests(self, namespace_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15504,7 +15503,7 @@ def list_recalled_data(self, namespace_name, **kwargs): "time_data_started_greater_than_or_equal", "time_data_ended_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recalled_data got unknown kwargs: {extra_kwargs!r}") @@ -15513,10 +15512,10 @@ def list_recalled_data(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -15541,14 +15540,14 @@ def list_recalled_data(self, namespace_name, **kwargs): "timeDataStartedGreaterThanOrEqual": kwargs.get("time_data_started_greater_than_or_equal", missing), "timeDataEndedLessThan": kwargs.get("time_data_ended_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15663,7 +15662,7 @@ def list_resource_categories(self, namespace_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_categories got unknown kwargs: {extra_kwargs!r}") @@ -15672,10 +15671,10 @@ def list_resource_categories(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -15701,14 +15700,14 @@ def list_resource_categories(self, namespace_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15834,7 +15833,7 @@ def list_rules(self, namespace_name, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rules got unknown kwargs: {extra_kwargs!r}") @@ -15843,10 +15842,10 @@ def list_rules(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'kind' in kwargs: @@ -15888,14 +15887,14 @@ def list_rules(self, namespace_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16020,7 +16019,7 @@ def list_scheduled_tasks(self, namespace_name, task_type, compartment_id, **kwar "display_name_contains", "target_service" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scheduled_tasks got unknown kwargs: {extra_kwargs!r}") @@ -16029,10 +16028,10 @@ def list_scheduled_tasks(self, namespace_name, task_type, compartment_id, **kwar "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') task_type_allowed_values = ["SAVED_SEARCH", "ACCELERATION", "PURGE"] @@ -16067,14 +16066,14 @@ def list_scheduled_tasks(self, namespace_name, task_type, compartment_id, **kwar "displayNameContains": kwargs.get("display_name_contains", missing), "targetService": kwargs.get("target_service", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16195,7 +16194,7 @@ def list_source_associations(self, namespace_name, source_name, compartment_id, "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_associations got unknown kwargs: {extra_kwargs!r}") @@ -16204,10 +16203,10 @@ def list_source_associations(self, namespace_name, source_name, compartment_id, "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'life_cycle_state' in kwargs: @@ -16242,14 +16241,14 @@ def list_source_associations(self, namespace_name, source_name, compartment_id, "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16369,7 +16368,7 @@ def list_source_event_types(self, namespace_name, source_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_event_types got unknown kwargs: {extra_kwargs!r}") @@ -16379,10 +16378,10 @@ def list_source_event_types(self, namespace_name, source_name, **kwargs): "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'is_system' in kwargs: @@ -16415,14 +16414,14 @@ def list_source_event_types(self, namespace_name, source_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16525,7 +16524,7 @@ def list_source_extended_field_definitions(self, namespace_name, source_name, ** "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_extended_field_definitions got unknown kwargs: {extra_kwargs!r}") @@ -16535,10 +16534,10 @@ def list_source_extended_field_definitions(self, namespace_name, source_name, ** "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16561,14 +16560,14 @@ def list_source_extended_field_definitions(self, namespace_name, source_name, ** "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16668,7 +16667,7 @@ def list_source_label_operators(self, namespace_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_label_operators got unknown kwargs: {extra_kwargs!r}") @@ -16677,10 +16676,10 @@ def list_source_label_operators(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16703,14 +16702,14 @@ def list_source_label_operators(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16810,7 +16809,7 @@ def list_source_meta_functions(self, namespace_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_meta_functions got unknown kwargs: {extra_kwargs!r}") @@ -16819,10 +16818,10 @@ def list_source_meta_functions(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16845,14 +16844,14 @@ def list_source_meta_functions(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16959,7 +16958,7 @@ def list_source_patterns(self, namespace_name, source_name, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_source_patterns got unknown kwargs: {extra_kwargs!r}") @@ -16969,10 +16968,10 @@ def list_source_patterns(self, namespace_name, source_name, **kwargs): "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -16996,14 +16995,14 @@ def list_source_patterns(self, namespace_name, source_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17149,7 +17148,7 @@ def list_sources(self, namespace_name, compartment_id, **kwargs): "is_simplified", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sources got unknown kwargs: {extra_kwargs!r}") @@ -17158,10 +17157,10 @@ def list_sources(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'is_system' in kwargs: @@ -17200,14 +17199,14 @@ def list_sources(self, namespace_name, compartment_id, **kwargs): "isSimplified": kwargs.get("is_simplified", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17315,7 +17314,7 @@ def list_storage_work_request_errors(self, compartment_id, work_request_id, name "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_storage_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -17325,10 +17324,10 @@ def list_storage_work_request_errors(self, compartment_id, work_request_id, name "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17352,14 +17351,14 @@ def list_storage_work_request_errors(self, compartment_id, work_request_id, name "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17491,7 +17490,7 @@ def list_storage_work_requests(self, compartment_id, namespace_name, **kwargs): "policy_name", "policy_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_storage_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -17500,10 +17499,10 @@ def list_storage_work_requests(self, compartment_id, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17547,14 +17546,14 @@ def list_storage_work_requests(self, compartment_id, namespace_name, **kwargs): "policyName": kwargs.get("policy_name", missing), "policyId": kwargs.get("policy_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17642,7 +17641,7 @@ def list_supported_char_encodings(self, namespace_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_supported_char_encodings got unknown kwargs: {extra_kwargs!r}") @@ -17651,24 +17650,24 @@ def list_supported_char_encodings(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17756,7 +17755,7 @@ def list_supported_timezones(self, namespace_name, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_supported_timezones got unknown kwargs: {extra_kwargs!r}") @@ -17765,24 +17764,24 @@ def list_supported_timezones(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17896,7 +17895,7 @@ def list_upload_files(self, namespace_name, upload_reference, **kwargs): "status", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_upload_files got unknown kwargs: {extra_kwargs!r}") @@ -17906,10 +17905,10 @@ def list_upload_files(self, namespace_name, upload_reference, **kwargs): "uploadReference": upload_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -17942,14 +17941,14 @@ def list_upload_files(self, namespace_name, upload_reference, **kwargs): "searchStr": kwargs.get("search_str", missing), "status": self.base_client.generate_collection_format_param(kwargs.get("status", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18040,7 +18039,7 @@ def list_upload_warnings(self, namespace_name, upload_reference, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_upload_warnings got unknown kwargs: {extra_kwargs!r}") @@ -18050,24 +18049,24 @@ def list_upload_warnings(self, namespace_name, upload_reference, **kwargs): "uploadReference": upload_reference } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18184,7 +18183,7 @@ def list_uploads(self, namespace_name, **kwargs): "opc_request_id", "warnings_filter" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_uploads got unknown kwargs: {extra_kwargs!r}") @@ -18193,10 +18192,10 @@ def list_uploads(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -18229,14 +18228,14 @@ def list_uploads(self, namespace_name, **kwargs): "sortBy": kwargs.get("sort_by", missing), "warningsFilter": kwargs.get("warnings_filter", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18389,7 +18388,7 @@ def list_warnings(self, namespace_name, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_warnings got unknown kwargs: {extra_kwargs!r}") @@ -18398,10 +18397,10 @@ def list_warnings(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'warning_state' in kwargs: @@ -18442,14 +18441,14 @@ def list_warnings(self, namespace_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18542,7 +18541,7 @@ def list_work_request_errors(self, namespace_name, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -18552,24 +18551,24 @@ def list_work_request_errors(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18660,7 +18659,7 @@ def list_work_request_logs(self, namespace_name, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -18670,24 +18669,24 @@ def list_work_request_logs(self, namespace_name, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18776,7 +18775,7 @@ def list_work_requests(self, namespace_name, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -18785,10 +18784,10 @@ def list_work_requests(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -18796,14 +18795,14 @@ def list_work_requests(self, namespace_name, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18889,7 +18888,7 @@ def offboard_namespace(self, namespace_name, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"offboard_namespace got unknown kwargs: {extra_kwargs!r}") @@ -18898,10 +18897,10 @@ def offboard_namespace(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -18910,7 +18909,7 @@ def offboard_namespace(self, namespace_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18993,7 +18992,7 @@ def onboard_namespace(self, namespace_name, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"onboard_namespace got unknown kwargs: {extra_kwargs!r}") @@ -19002,10 +19001,10 @@ def onboard_namespace(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19014,7 +19013,7 @@ def onboard_namespace(self, namespace_name, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19092,7 +19091,7 @@ def parse_query(self, namespace_name, parse_query_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"parse_query got unknown kwargs: {extra_kwargs!r}") @@ -19101,10 +19100,10 @@ def parse_query(self, namespace_name, parse_query_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19112,7 +19111,7 @@ def parse_query(self, namespace_name, parse_query_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -19208,7 +19207,7 @@ def pause_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"pause_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -19218,10 +19217,10 @@ def pause_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19230,7 +19229,7 @@ def pause_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19328,7 +19327,7 @@ def purge_storage_data(self, namespace_name, purge_storage_data_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"purge_storage_data got unknown kwargs: {extra_kwargs!r}") @@ -19337,10 +19336,10 @@ def purge_storage_data(self, namespace_name, purge_storage_data_details, **kwarg "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19350,7 +19349,7 @@ def purge_storage_data(self, namespace_name, purge_storage_data_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -19444,7 +19443,7 @@ def put_query_work_request_background(self, namespace_name, work_request_id, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_query_work_request_background got unknown kwargs: {extra_kwargs!r}") @@ -19454,10 +19453,10 @@ def put_query_work_request_background(self, namespace_name, work_request_id, **k "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19466,7 +19465,7 @@ def put_query_work_request_background(self, namespace_name, work_request_id, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19553,7 +19552,7 @@ def query(self, namespace_name, query_details, **kwargs): "opc_request_id", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"query got unknown kwargs: {extra_kwargs!r}") @@ -19562,24 +19561,24 @@ def query(self, namespace_name, query_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -19684,7 +19683,7 @@ def recall_archived_data(self, namespace_name, recall_archived_data_details, **k "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"recall_archived_data got unknown kwargs: {extra_kwargs!r}") @@ -19693,10 +19692,10 @@ def recall_archived_data(self, namespace_name, recall_archived_data_details, **k "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -19706,7 +19705,7 @@ def recall_archived_data(self, namespace_name, recall_archived_data_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -19836,7 +19835,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "opc_request_id", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"register_lookup got unknown kwargs: {extra_kwargs!r}") @@ -19845,10 +19844,10 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') type_allowed_values = ["Lookup", "Dictionary", "Module"] @@ -19864,7 +19863,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "isHidden": kwargs.get("is_hidden", missing), "type": type } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json;charset=UTF-8", @@ -19872,7 +19871,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "opc-request-id": kwargs.get("opc_request_id", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -19885,7 +19884,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod register_lookup_content_file_body = kwargs.get("register_lookup_content_file_body", missing) if register_lookup_content_file_body is not missing and register_lookup_content_file_body is not None: - if (not isinstance(register_lookup_content_file_body, (six.binary_type, six.string_types)) and + if (not isinstance(register_lookup_content_file_body, (bytes, str)) and not hasattr(register_lookup_content_file_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -19999,7 +19998,7 @@ def release_recalled_data(self, namespace_name, release_recalled_data_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"release_recalled_data got unknown kwargs: {extra_kwargs!r}") @@ -20008,10 +20007,10 @@ def release_recalled_data(self, namespace_name, release_recalled_data_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20021,7 +20020,7 @@ def release_recalled_data(self, namespace_name, release_recalled_data_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -20124,7 +20123,7 @@ def remove_entity_associations(self, namespace_name, log_analytics_entity_id, re "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_entity_associations got unknown kwargs: {extra_kwargs!r}") @@ -20134,10 +20133,10 @@ def remove_entity_associations(self, namespace_name, log_analytics_entity_id, re "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20147,7 +20146,7 @@ def remove_entity_associations(self, namespace_name, log_analytics_entity_id, re "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -20241,7 +20240,7 @@ def remove_preferences(self, namespace_name, remove_preferences_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_preferences got unknown kwargs: {extra_kwargs!r}") @@ -20250,10 +20249,10 @@ def remove_preferences(self, namespace_name, remove_preferences_details, **kwarg "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20262,7 +20261,7 @@ def remove_preferences(self, namespace_name, remove_preferences_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -20348,7 +20347,7 @@ def remove_resource_categories(self, namespace_name, remove_resource_categories_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_resource_categories got unknown kwargs: {extra_kwargs!r}") @@ -20357,10 +20356,10 @@ def remove_resource_categories(self, namespace_name, remove_resource_categories_ "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20368,7 +20367,7 @@ def remove_resource_categories(self, namespace_name, remove_resource_categories_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -20464,7 +20463,7 @@ def remove_source_event_types(self, namespace_name, source_name, remove_event_ty "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_source_event_types got unknown kwargs: {extra_kwargs!r}") @@ -20474,10 +20473,10 @@ def remove_source_event_types(self, namespace_name, source_name, remove_event_ty "sourceName": source_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20486,7 +20485,7 @@ def remove_source_event_types(self, namespace_name, source_name, remove_event_ty "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -20581,7 +20580,7 @@ def resume_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -20591,10 +20590,10 @@ def resume_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20603,7 +20602,7 @@ def resume_scheduled_task(self, namespace_name, scheduled_task_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20705,7 +20704,7 @@ def run(self, namespace_name, scheduled_task_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"run got unknown kwargs: {extra_kwargs!r}") @@ -20715,17 +20714,17 @@ def run(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "timeStart": kwargs.get("time_start", missing), "timeEnd": kwargs.get("time_end", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -20733,7 +20732,7 @@ def run(self, namespace_name, scheduled_task_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20820,7 +20819,7 @@ def set_unprocessed_data_bucket(self, namespace_name, bucket_name, **kwargs): "is_enabled", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"set_unprocessed_data_bucket got unknown kwargs: {extra_kwargs!r}") @@ -20829,24 +20828,24 @@ def set_unprocessed_data_bucket(self, namespace_name, bucket_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "bucketName": bucket_name, "isEnabled": kwargs.get("is_enabled", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20927,7 +20926,7 @@ def suggest(self, namespace_name, suggest_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"suggest got unknown kwargs: {extra_kwargs!r}") @@ -20936,10 +20935,10 @@ def suggest(self, namespace_name, suggest_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20947,7 +20946,7 @@ def suggest(self, namespace_name, suggest_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21045,7 +21044,7 @@ def suppress_warning(self, namespace_name, warning_reference_details, compartmen "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"suppress_warning got unknown kwargs: {extra_kwargs!r}") @@ -21054,16 +21053,16 @@ def suppress_warning(self, namespace_name, warning_reference_details, compartmen "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21071,7 +21070,7 @@ def suppress_warning(self, namespace_name, warning_reference_details, compartmen "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21178,7 +21177,7 @@ def test_parser(self, namespace_name, test_parser_payload_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_parser got unknown kwargs: {extra_kwargs!r}") @@ -21187,10 +21186,10 @@ def test_parser(self, namespace_name, test_parser_payload_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'scope' in kwargs: @@ -21204,7 +21203,7 @@ def test_parser(self, namespace_name, test_parser_payload_details, **kwargs): "scope": kwargs.get("scope", missing), "reqOriginModule": kwargs.get("req_origin_module", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21212,7 +21211,7 @@ def test_parser(self, namespace_name, test_parser_payload_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21313,7 +21312,7 @@ def unsuppress_warning(self, namespace_name, warning_reference_details, compartm "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unsuppress_warning got unknown kwargs: {extra_kwargs!r}") @@ -21322,16 +21321,16 @@ def unsuppress_warning(self, namespace_name, warning_reference_details, compartm "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -21339,7 +21338,7 @@ def unsuppress_warning(self, namespace_name, warning_reference_details, compartm "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21438,7 +21437,7 @@ def update_ingest_time_rule(self, namespace_name, ingest_time_rule_id, update_in "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ingest_time_rule got unknown kwargs: {extra_kwargs!r}") @@ -21448,10 +21447,10 @@ def update_ingest_time_rule(self, namespace_name, ingest_time_rule_id, update_in "ingestTimeRuleId": ingest_time_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -21460,7 +21459,7 @@ def update_ingest_time_rule(self, namespace_name, ingest_time_rule_id, update_in "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21558,7 +21557,7 @@ def update_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_analytics_em_bridge got unknown kwargs: {extra_kwargs!r}") @@ -21568,10 +21567,10 @@ def update_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "logAnalyticsEmBridgeId": log_analytics_em_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -21580,7 +21579,7 @@ def update_log_analytics_em_bridge(self, namespace_name, log_analytics_em_bridge "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21676,7 +21675,7 @@ def update_log_analytics_entity(self, namespace_name, log_analytics_entity_id, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_analytics_entity got unknown kwargs: {extra_kwargs!r}") @@ -21686,10 +21685,10 @@ def update_log_analytics_entity(self, namespace_name, log_analytics_entity_id, u "logAnalyticsEntityId": log_analytics_entity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -21698,7 +21697,7 @@ def update_log_analytics_entity(self, namespace_name, log_analytics_entity_id, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21794,7 +21793,7 @@ def update_log_analytics_entity_type(self, namespace_name, update_log_analytics_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_analytics_entity_type got unknown kwargs: {extra_kwargs!r}") @@ -21804,10 +21803,10 @@ def update_log_analytics_entity_type(self, namespace_name, update_log_analytics_ "entityTypeName": entity_type_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -21816,7 +21815,7 @@ def update_log_analytics_entity_type(self, namespace_name, update_log_analytics_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -21910,7 +21909,7 @@ def update_log_analytics_log_group(self, namespace_name, log_analytics_log_group "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_analytics_log_group got unknown kwargs: {extra_kwargs!r}") @@ -21920,10 +21919,10 @@ def update_log_analytics_log_group(self, namespace_name, log_analytics_log_group "logAnalyticsLogGroupId": log_analytics_log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -21932,7 +21931,7 @@ def update_log_analytics_log_group(self, namespace_name, log_analytics_log_group "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22032,7 +22031,7 @@ def update_log_analytics_object_collection_rule(self, namespace_name, log_analyt "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_analytics_object_collection_rule got unknown kwargs: {extra_kwargs!r}") @@ -22042,10 +22041,10 @@ def update_log_analytics_object_collection_rule(self, namespace_name, log_analyt "logAnalyticsObjectCollectionRuleId": log_analytics_object_collection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22054,7 +22053,7 @@ def update_log_analytics_object_collection_rule(self, namespace_name, log_analyt "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22158,7 +22157,7 @@ def update_lookup(self, namespace_name, lookup_name, update_lookup_metadata_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_lookup got unknown kwargs: {extra_kwargs!r}") @@ -22168,10 +22167,10 @@ def update_lookup(self, namespace_name, lookup_name, update_lookup_metadata_deta "lookupName": lookup_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22181,7 +22180,7 @@ def update_lookup(self, namespace_name, lookup_name, update_lookup_metadata_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22310,7 +22309,7 @@ def update_lookup_data(self, namespace_name, lookup_name, update_lookup_file_bod "if_match", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_lookup_data got unknown kwargs: {extra_kwargs!r}") @@ -22320,17 +22319,17 @@ def update_lookup_data(self, namespace_name, lookup_name, update_lookup_file_bod "lookupName": lookup_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isForce": kwargs.get("is_force", missing), "charEncoding": kwargs.get("char_encoding", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22339,7 +22338,7 @@ def update_lookup_data(self, namespace_name, lookup_name, update_lookup_file_bod "if-match": kwargs.get("if_match", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22352,7 +22351,7 @@ def update_lookup_data(self, namespace_name, lookup_name, update_lookup_file_bod update_lookup_file_body = kwargs.get("update_lookup_file_body", missing) if update_lookup_file_body is not missing and update_lookup_file_body is not None: - if (not isinstance(update_lookup_file_body, (six.binary_type, six.string_types)) and + if (not isinstance(update_lookup_file_body, (bytes, str)) and not hasattr(update_lookup_file_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -22456,7 +22455,7 @@ def update_preferences(self, namespace_name, update_preferences_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_preferences got unknown kwargs: {extra_kwargs!r}") @@ -22465,10 +22464,10 @@ def update_preferences(self, namespace_name, update_preferences_details, **kwarg "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22477,7 +22476,7 @@ def update_preferences(self, namespace_name, update_preferences_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22563,7 +22562,7 @@ def update_resource_categories(self, namespace_name, update_resource_categories_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_resource_categories got unknown kwargs: {extra_kwargs!r}") @@ -22572,10 +22571,10 @@ def update_resource_categories(self, namespace_name, update_resource_categories_ "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22583,7 +22582,7 @@ def update_resource_categories(self, namespace_name, update_resource_categories_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22681,7 +22680,7 @@ def update_scheduled_task(self, namespace_name, scheduled_task_id, update_schedu "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_scheduled_task got unknown kwargs: {extra_kwargs!r}") @@ -22691,10 +22690,10 @@ def update_scheduled_task(self, namespace_name, scheduled_task_id, update_schedu "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22703,7 +22702,7 @@ def update_scheduled_task(self, namespace_name, scheduled_task_id, update_schedu "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22798,7 +22797,7 @@ def update_storage(self, namespace_name, update_storage_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_storage got unknown kwargs: {extra_kwargs!r}") @@ -22807,10 +22806,10 @@ def update_storage(self, namespace_name, update_storage_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -22819,7 +22818,7 @@ def update_storage(self, namespace_name, update_storage_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -22952,7 +22951,7 @@ def upload_discovery_data(self, namespace_name, upload_discovery_data_details, * "opc_retry_token", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_discovery_data got unknown kwargs: {extra_kwargs!r}") @@ -22961,10 +22960,10 @@ def upload_discovery_data(self, namespace_name, upload_discovery_data_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'discovery_data_type' in kwargs: @@ -22986,7 +22985,7 @@ def upload_discovery_data(self, namespace_name, upload_discovery_data_details, * "logGroupId": kwargs.get("log_group_id", missing), "payloadType": kwargs.get("payload_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -22996,7 +22995,7 @@ def upload_discovery_data(self, namespace_name, upload_discovery_data_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23009,7 +23008,7 @@ def upload_discovery_data(self, namespace_name, upload_discovery_data_details, * upload_discovery_data_details = kwargs.get("upload_discovery_data_details", missing) if upload_discovery_data_details is not missing and upload_discovery_data_details is not None: - if (not isinstance(upload_discovery_data_details, (six.binary_type, six.string_types)) and + if (not isinstance(upload_discovery_data_details, (bytes, str)) and not hasattr(upload_discovery_data_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -23154,7 +23153,7 @@ def upload_log_events_file(self, namespace_name, log_group_id, upload_log_events "opc_meta_properties", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_log_events_file got unknown kwargs: {extra_kwargs!r}") @@ -23163,10 +23162,10 @@ def upload_log_events_file(self, namespace_name, log_group_id, upload_log_events "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'payload_type' in kwargs: @@ -23181,7 +23180,7 @@ def upload_log_events_file(self, namespace_name, log_group_id, upload_log_events "logSet": kwargs.get("log_set", missing), "payloadType": kwargs.get("payload_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -23191,7 +23190,7 @@ def upload_log_events_file(self, namespace_name, log_group_id, upload_log_events "opc-meta-properties": kwargs.get("opc_meta_properties", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23204,7 +23203,7 @@ def upload_log_events_file(self, namespace_name, log_group_id, upload_log_events upload_log_events_file_details = kwargs.get("upload_log_events_file_details", missing) if upload_log_events_file_details is not missing and upload_log_events_file_details is not None: - if (not isinstance(upload_log_events_file_details, (six.binary_type, six.string_types)) and + if (not isinstance(upload_log_events_file_details, (bytes, str)) and not hasattr(upload_log_events_file_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -23377,7 +23376,7 @@ def upload_log_file(self, namespace_name, upload_name, log_source_name, filename "log_set", "expect" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_log_file got unknown kwargs: {extra_kwargs!r}") @@ -23386,10 +23385,10 @@ def upload_log_file(self, namespace_name, upload_name, log_source_name, filename "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -23404,7 +23403,7 @@ def upload_log_file(self, namespace_name, upload_name, log_source_name, filename "filename": filename, "logSet": kwargs.get("log_set", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -23415,7 +23414,7 @@ def upload_log_file(self, namespace_name, upload_name, log_source_name, filename "opc-retry-token": kwargs.get("opc_retry_token", missing), "expect": kwargs.get("expect", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23428,7 +23427,7 @@ def upload_log_file(self, namespace_name, upload_name, log_source_name, filename upload_log_file_body = kwargs.get("upload_log_file_body", missing) if upload_log_file_body is not missing and upload_log_file_body is not None: - if (not isinstance(upload_log_file_body, (six.binary_type, six.string_types)) and + if (not isinstance(upload_log_file_body, (bytes, str)) and not hasattr(upload_log_file_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -23540,7 +23539,7 @@ def upsert_associations(self, namespace_name, upsert_log_analytics_association_d "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upsert_associations got unknown kwargs: {extra_kwargs!r}") @@ -23549,16 +23548,16 @@ def upsert_associations(self, namespace_name, upsert_log_analytics_association_d "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isFromRepublish": kwargs.get("is_from_republish", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -23566,7 +23565,7 @@ def upsert_associations(self, namespace_name, upsert_log_analytics_association_d "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23670,7 +23669,7 @@ def upsert_field(self, namespace_name, upsert_log_analytics_field_details, **kwa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upsert_field got unknown kwargs: {extra_kwargs!r}") @@ -23679,10 +23678,10 @@ def upsert_field(self, namespace_name, upsert_log_analytics_field_details, **kwa "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23692,7 +23691,7 @@ def upsert_field(self, namespace_name, upsert_log_analytics_field_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23796,7 +23795,7 @@ def upsert_label(self, namespace_name, upsert_log_analytics_label_details, **kwa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upsert_label got unknown kwargs: {extra_kwargs!r}") @@ -23805,10 +23804,10 @@ def upsert_label(self, namespace_name, upsert_log_analytics_label_details, **kwa "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23818,7 +23817,7 @@ def upsert_label(self, namespace_name, upsert_log_analytics_label_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -23922,7 +23921,7 @@ def upsert_parser(self, namespace_name, upsert_log_analytics_parser_details, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upsert_parser got unknown kwargs: {extra_kwargs!r}") @@ -23931,10 +23930,10 @@ def upsert_parser(self, namespace_name, upsert_log_analytics_parser_details, **k "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -23944,7 +23943,7 @@ def upsert_parser(self, namespace_name, upsert_log_analytics_parser_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24062,7 +24061,7 @@ def upsert_source(self, namespace_name, upsert_log_analytics_source_details, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upsert_source got unknown kwargs: {extra_kwargs!r}") @@ -24071,10 +24070,10 @@ def upsert_source(self, namespace_name, upsert_log_analytics_source_details, **k "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -24082,7 +24081,7 @@ def upsert_source(self, namespace_name, upsert_log_analytics_source_details, **k "isIncremental": kwargs.get("is_incremental", missing), "isIgnoreWarning": kwargs.get("is_ignore_warning", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24091,7 +24090,7 @@ def upsert_source(self, namespace_name, upsert_log_analytics_source_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24209,7 +24208,7 @@ def validate_association_parameters(self, namespace_name, upsert_log_analytics_a "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_association_parameters got unknown kwargs: {extra_kwargs!r}") @@ -24218,10 +24217,10 @@ def validate_association_parameters(self, namespace_name, upsert_log_analytics_a "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -24244,7 +24243,7 @@ def validate_association_parameters(self, namespace_name, upsert_log_analytics_a "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24252,7 +24251,7 @@ def validate_association_parameters(self, namespace_name, upsert_log_analytics_a "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24342,7 +24341,7 @@ def validate_endpoint(self, namespace_name, validate_endpoint_details, **kwargs) "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -24351,10 +24350,10 @@ def validate_endpoint(self, namespace_name, validate_endpoint_details, **kwargs) "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24362,7 +24361,7 @@ def validate_endpoint(self, namespace_name, validate_endpoint_details, **kwargs) "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24452,7 +24451,7 @@ def validate_file(self, namespace_name, object_location, filename, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_file got unknown kwargs: {extra_kwargs!r}") @@ -24461,24 +24460,24 @@ def validate_file(self, namespace_name, object_location, filename, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "objectLocation": object_location, "filename": filename } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24565,7 +24564,7 @@ def validate_label_condition(self, namespace_name, validate_label_condition_deta "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_label_condition got unknown kwargs: {extra_kwargs!r}") @@ -24574,10 +24573,10 @@ def validate_label_condition(self, namespace_name, validate_label_condition_deta "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24585,7 +24584,7 @@ def validate_label_condition(self, namespace_name, validate_label_condition_deta "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24694,7 +24693,7 @@ def validate_source(self, namespace_name, upsert_log_analytics_source_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_source got unknown kwargs: {extra_kwargs!r}") @@ -24703,10 +24702,10 @@ def validate_source(self, namespace_name, upsert_log_analytics_source_details, * "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -24714,7 +24713,7 @@ def validate_source(self, namespace_name, upsert_log_analytics_source_details, * "isIncremental": kwargs.get("is_incremental", missing), "isIgnoreWarning": kwargs.get("is_ignore_warning", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -24722,7 +24721,7 @@ def validate_source(self, namespace_name, upsert_log_analytics_source_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24820,7 +24819,7 @@ def validate_source_extended_field_details(self, namespace_name, log_analytics_s "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_source_extended_field_details got unknown kwargs: {extra_kwargs!r}") @@ -24829,10 +24828,10 @@ def validate_source_extended_field_details(self, namespace_name, log_analytics_s "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -24841,7 +24840,7 @@ def validate_source_extended_field_details(self, namespace_name, log_analytics_s "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -24935,7 +24934,7 @@ def validate_source_mapping(self, namespace_name, object_location, filename, log "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_source_mapping got unknown kwargs: {extra_kwargs!r}") @@ -24944,10 +24943,10 @@ def validate_source_mapping(self, namespace_name, object_location, filename, log "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -24955,14 +24954,14 @@ def validate_source_mapping(self, namespace_name, object_location, filename, log "filename": filename, "logSourceName": log_source_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25062,7 +25061,7 @@ def verify(self, namespace_name, scheduled_task_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"verify got unknown kwargs: {extra_kwargs!r}") @@ -25072,16 +25071,16 @@ def verify(self, namespace_name, scheduled_task_id, **kwargs): "scheduledTaskId": scheduled_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "shouldIncludeResults": kwargs.get("should_include_results", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -25089,7 +25088,7 @@ def verify(self, namespace_name, scheduled_task_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/logging/logging_management_client.py b/src/oci/logging/logging_management_client.py index 268c583eac..c1629b643f 100644 --- a/src/oci/logging/logging_management_client.py +++ b/src/oci/logging/logging_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -176,7 +175,7 @@ def change_log_group_compartment(self, log_group_id, change_log_group_compartmen "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def change_log_group_compartment(self, log_group_id, change_log_group_compartmen "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def change_log_group_compartment(self, log_group_id, change_log_group_compartmen "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -288,7 +287,7 @@ def change_log_log_group(self, log_group_id, log_id, change_log_log_group_detail "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_log_group got unknown kwargs: {extra_kwargs!r}") @@ -298,10 +297,10 @@ def change_log_log_group(self, log_group_id, log_id, change_log_log_group_detail "logId": log_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -310,7 +309,7 @@ def change_log_log_group(self, log_group_id, log_id, change_log_log_group_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -410,7 +409,7 @@ def change_log_saved_search_compartment(self, log_saved_search_id, change_log_sa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_log_saved_search_compartment got unknown kwargs: {extra_kwargs!r}") @@ -419,10 +418,10 @@ def change_log_saved_search_compartment(self, log_saved_search_id, change_log_sa "logSavedSearchId": log_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -432,7 +431,7 @@ def change_log_saved_search_compartment(self, log_saved_search_id, change_log_sa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -533,7 +532,7 @@ def change_unified_agent_configuration_compartment(self, unified_agent_configura "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_unified_agent_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -542,10 +541,10 @@ def change_unified_agent_configuration_compartment(self, unified_agent_configura "unifiedAgentConfigurationId": unified_agent_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -555,7 +554,7 @@ def change_unified_agent_configuration_compartment(self, unified_agent_configura "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -646,7 +645,7 @@ def create_log(self, log_group_id, create_log_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log got unknown kwargs: {extra_kwargs!r}") @@ -655,10 +654,10 @@ def create_log(self, log_group_id, create_log_details, **kwargs): "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -667,7 +666,7 @@ def create_log(self, log_group_id, create_log_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -755,7 +754,7 @@ def create_log_group(self, create_log_group_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_group got unknown kwargs: {extra_kwargs!r}") @@ -766,7 +765,7 @@ def create_log_group(self, create_log_group_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -851,7 +850,7 @@ def create_log_saved_search(self, create_log_saved_search_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_log_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -862,7 +861,7 @@ def create_log_saved_search(self, create_log_saved_search_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -949,7 +948,7 @@ def create_unified_agent_configuration(self, create_unified_agent_configuration_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_unified_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -960,7 +959,7 @@ def create_unified_agent_configuration(self, create_unified_agent_configuration_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1047,7 +1046,7 @@ def delete_log(self, log_group_id, log_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log got unknown kwargs: {extra_kwargs!r}") @@ -1057,10 +1056,10 @@ def delete_log(self, log_group_id, log_id, **kwargs): "logId": log_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1069,7 +1068,7 @@ def delete_log(self, log_group_id, log_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1152,7 +1151,7 @@ def delete_log_group(self, log_group_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_group got unknown kwargs: {extra_kwargs!r}") @@ -1161,10 +1160,10 @@ def delete_log_group(self, log_group_id, **kwargs): "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1173,7 +1172,7 @@ def delete_log_group(self, log_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1256,7 +1255,7 @@ def delete_log_saved_search(self, log_saved_search_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_log_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -1265,10 +1264,10 @@ def delete_log_saved_search(self, log_saved_search_id, **kwargs): "logSavedSearchId": log_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1277,7 +1276,7 @@ def delete_log_saved_search(self, log_saved_search_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1360,7 +1359,7 @@ def delete_unified_agent_configuration(self, unified_agent_configuration_id, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_unified_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1369,10 +1368,10 @@ def delete_unified_agent_configuration(self, unified_agent_configuration_id, **k "unifiedAgentConfigurationId": unified_agent_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1381,7 +1380,7 @@ def delete_unified_agent_configuration(self, unified_agent_configuration_id, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1464,7 +1463,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1473,10 +1472,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1485,7 +1484,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1563,7 +1562,7 @@ def get_log(self, log_group_id, log_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log got unknown kwargs: {extra_kwargs!r}") @@ -1573,10 +1572,10 @@ def get_log(self, log_group_id, log_id, **kwargs): "logId": log_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1584,7 +1583,7 @@ def get_log(self, log_group_id, log_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1661,7 +1660,7 @@ def get_log_group(self, log_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_group got unknown kwargs: {extra_kwargs!r}") @@ -1670,10 +1669,10 @@ def get_log_group(self, log_group_id, **kwargs): "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1681,7 +1680,7 @@ def get_log_group(self, log_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1758,7 +1757,7 @@ def get_log_saved_search(self, log_saved_search_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_log_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -1767,10 +1766,10 @@ def get_log_saved_search(self, log_saved_search_id, **kwargs): "logSavedSearchId": log_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1778,7 +1777,7 @@ def get_log_saved_search(self, log_saved_search_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1855,7 +1854,7 @@ def get_unified_agent_configuration(self, unified_agent_configuration_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_unified_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1864,10 +1863,10 @@ def get_unified_agent_configuration(self, unified_agent_configuration_id, **kwar "unifiedAgentConfigurationId": unified_agent_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1875,7 +1874,7 @@ def get_unified_agent_configuration(self, unified_agent_configuration_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1952,7 +1951,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1961,10 +1960,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1972,7 +1971,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2082,7 +2081,7 @@ def list_log_groups(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_groups got unknown kwargs: {extra_kwargs!r}") @@ -2110,14 +2109,14 @@ def list_log_groups(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2227,7 +2226,7 @@ def list_log_saved_searches(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_log_saved_searches got unknown kwargs: {extra_kwargs!r}") @@ -2255,14 +2254,14 @@ def list_log_saved_searches(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2387,7 +2386,7 @@ def list_logs(self, log_group_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_logs got unknown kwargs: {extra_kwargs!r}") @@ -2396,10 +2395,10 @@ def list_logs(self, log_group_id, **kwargs): "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'log_type' in kwargs: @@ -2441,14 +2440,14 @@ def list_logs(self, log_group_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2524,7 +2523,7 @@ def list_services(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_services got unknown kwargs: {extra_kwargs!r}") @@ -2534,7 +2533,7 @@ def list_services(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2656,7 +2655,7 @@ def list_unified_agent_configurations(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_unified_agent_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2694,14 +2693,14 @@ def list_unified_agent_configurations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2789,7 +2788,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2798,24 +2797,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2905,7 +2904,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2914,24 +2913,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3046,7 +3045,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3081,14 +3080,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3180,7 +3179,7 @@ def update_log(self, log_group_id, log_id, update_log_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log got unknown kwargs: {extra_kwargs!r}") @@ -3190,10 +3189,10 @@ def update_log(self, log_group_id, log_id, update_log_details, **kwargs): "logId": log_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3202,7 +3201,7 @@ def update_log(self, log_group_id, log_id, update_log_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3291,7 +3290,7 @@ def update_log_group(self, log_group_id, update_log_group_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_group got unknown kwargs: {extra_kwargs!r}") @@ -3300,10 +3299,10 @@ def update_log_group(self, log_group_id, update_log_group_details, **kwargs): "logGroupId": log_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3312,7 +3311,7 @@ def update_log_group(self, log_group_id, update_log_group_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3400,7 +3399,7 @@ def update_log_saved_search(self, log_saved_search_id, update_log_saved_search_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_log_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -3409,10 +3408,10 @@ def update_log_saved_search(self, log_saved_search_id, update_log_saved_search_d "logSavedSearchId": log_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3421,7 +3420,7 @@ def update_log_saved_search(self, log_saved_search_id, update_log_saved_search_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3512,7 +3511,7 @@ def update_unified_agent_configuration(self, unified_agent_configuration_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_unified_agent_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3521,10 +3520,10 @@ def update_unified_agent_configuration(self, unified_agent_configuration_id, upd "unifiedAgentConfigurationId": unified_agent_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3533,7 +3532,7 @@ def update_unified_agent_configuration(self, unified_agent_configuration_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/loggingingestion/logging_client.py b/src/oci/loggingingestion/logging_client.py index 4ea4fcdfdb..7309d1f7c0 100644 --- a/src/oci/loggingingestion/logging_client.py +++ b/src/oci/loggingingestion/logging_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def put_logs(self, log_id, put_logs_details, **kwargs): "opc_agent_version", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_logs got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def put_logs(self, log_id, put_logs_details, **kwargs): "logId": log_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def put_logs(self, log_id, put_logs_details, **kwargs): "opc-agent-version": kwargs.get("opc_agent_version", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/loggingsearch/log_search_client.py b/src/oci/loggingsearch/log_search_client.py index f484ebd1a5..2f60350092 100644 --- a/src/oci/loggingsearch/log_search_client.py +++ b/src/oci/loggingsearch/log_search_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def search_logs(self, search_logs_details, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_logs got unknown kwargs: {extra_kwargs!r}") @@ -183,14 +182,14 @@ def search_logs(self, search_logs_details, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/management_agent/management_agent_client.py b/src/oci/management_agent/management_agent_client.py index 259e5b0a0e..771ef7b6c4 100644 --- a/src/oci/management_agent/management_agent_client.py +++ b/src/oci/management_agent/management_agent_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def create_data_source(self, management_agent_id, create_data_source_details, ** "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_data_source got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def create_data_source(self, management_agent_id, create_data_source_details, ** "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def create_data_source(self, management_agent_id, create_data_source_details, ** "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -285,7 +284,7 @@ def create_management_agent_install_key(self, create_management_agent_install_ke "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_management_agent_install_key got unknown kwargs: {extra_kwargs!r}") @@ -296,7 +295,7 @@ def create_management_agent_install_key(self, create_management_agent_install_ke "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def delete_data_source(self, management_agent_id, data_source_key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_data_source got unknown kwargs: {extra_kwargs!r}") @@ -394,10 +393,10 @@ def delete_data_source(self, management_agent_id, data_source_key, **kwargs): "dataSourceKey": data_source_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -406,7 +405,7 @@ def delete_data_source(self, management_agent_id, data_source_key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -488,7 +487,7 @@ def delete_management_agent(self, management_agent_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_management_agent got unknown kwargs: {extra_kwargs!r}") @@ -497,10 +496,10 @@ def delete_management_agent(self, management_agent_id, **kwargs): "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -509,7 +508,7 @@ def delete_management_agent(self, management_agent_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -591,7 +590,7 @@ def delete_management_agent_install_key(self, management_agent_install_key_id, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_management_agent_install_key got unknown kwargs: {extra_kwargs!r}") @@ -600,10 +599,10 @@ def delete_management_agent_install_key(self, management_agent_install_key_id, * "managementAgentInstallKeyId": management_agent_install_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -612,7 +611,7 @@ def delete_management_agent_install_key(self, management_agent_install_key_id, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def delete_work_request(self, work_request_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -703,10 +702,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -715,7 +714,7 @@ def delete_work_request(self, work_request_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -797,7 +796,7 @@ def deploy_plugins(self, deploy_plugins_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deploy_plugins got unknown kwargs: {extra_kwargs!r}") @@ -808,7 +807,7 @@ def deploy_plugins(self, deploy_plugins_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -884,7 +883,7 @@ def get_auto_upgradable_config(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_auto_upgradable_config got unknown kwargs: {extra_kwargs!r}") @@ -892,14 +891,14 @@ def get_auto_upgradable_config(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -986,7 +985,7 @@ def get_data_source(self, management_agent_id, data_source_key, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_data_source got unknown kwargs: {extra_kwargs!r}") @@ -996,10 +995,10 @@ def get_data_source(self, management_agent_id, data_source_key, **kwargs): "dataSourceKey": data_source_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1008,7 +1007,7 @@ def get_data_source(self, management_agent_id, data_source_key, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1085,7 +1084,7 @@ def get_management_agent(self, management_agent_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_agent got unknown kwargs: {extra_kwargs!r}") @@ -1094,10 +1093,10 @@ def get_management_agent(self, management_agent_id, **kwargs): "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1105,7 +1104,7 @@ def get_management_agent(self, management_agent_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1181,7 +1180,7 @@ def get_management_agent_install_key(self, management_agent_install_key_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_agent_install_key got unknown kwargs: {extra_kwargs!r}") @@ -1190,10 +1189,10 @@ def get_management_agent_install_key(self, management_agent_install_key_id, **kw "managementAgentInstallKeyId": management_agent_install_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1201,7 +1200,7 @@ def get_management_agent_install_key(self, management_agent_install_key_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1281,7 +1280,7 @@ def get_management_agent_install_key_content(self, management_agent_install_key_ "opc_request_id", "plugin_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_agent_install_key_content got unknown kwargs: {extra_kwargs!r}") @@ -1290,23 +1289,23 @@ def get_management_agent_install_key_content(self, management_agent_install_key_ "managementAgentInstallKeyId": management_agent_install_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "pluginName": self.base_client.generate_collection_format_param(kwargs.get("plugin_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/octet-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1384,7 +1383,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1393,10 +1392,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1404,7 +1403,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1516,7 +1515,7 @@ def list_availability_histories(self, management_agent_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_availability_histories got unknown kwargs: {extra_kwargs!r}") @@ -1525,10 +1524,10 @@ def list_availability_histories(self, management_agent_id, **kwargs): "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1553,14 +1552,14 @@ def list_availability_histories(self, management_agent_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1662,7 +1661,7 @@ def list_data_sources(self, management_agent_id, **kwargs): "sort_by", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_data_sources got unknown kwargs: {extra_kwargs!r}") @@ -1671,10 +1670,10 @@ def list_data_sources(self, management_agent_id, **kwargs): "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1698,14 +1697,14 @@ def list_data_sources(self, management_agent_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": self.base_client.generate_collection_format_param(kwargs.get("name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1827,7 +1826,7 @@ def list_management_agent_images(self, compartment_id, **kwargs): "lifecycle_state", "install_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_agent_images got unknown kwargs: {extra_kwargs!r}") @@ -1870,7 +1869,7 @@ def list_management_agent_images(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "installType": kwargs.get("install_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1878,7 +1877,7 @@ def list_management_agent_images(self, compartment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1989,7 +1988,7 @@ def list_management_agent_install_keys(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_agent_install_keys got unknown kwargs: {extra_kwargs!r}") @@ -2025,14 +2024,14 @@ def list_management_agent_install_keys(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2148,7 +2147,7 @@ def list_management_agent_plugins(self, compartment_id, **kwargs): "platform_type", "agent_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_agent_plugins got unknown kwargs: {extra_kwargs!r}") @@ -2193,14 +2192,14 @@ def list_management_agent_plugins(self, compartment_id, **kwargs): "platformType": self.base_client.generate_collection_format_param(kwargs.get("platform_type", missing), 'multi'), "agentId": kwargs.get("agent_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2364,7 +2363,7 @@ def list_management_agents(self, compartment_id, **kwargs): "data_source_type", "data_source_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_agents got unknown kwargs: {extra_kwargs!r}") @@ -2440,14 +2439,14 @@ def list_management_agents(self, compartment_id, **kwargs): "dataSourceType": kwargs.get("data_source_type", missing), "dataSourceName": self.base_client.generate_collection_format_param(kwargs.get("data_source_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2543,7 +2542,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2552,10 +2551,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2578,14 +2577,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2683,7 +2682,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2692,10 +2691,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2718,14 +2717,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2845,7 +2844,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2890,14 +2889,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2982,7 +2981,7 @@ def set_auto_upgradable_config(self, set_auto_upgradable_config_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"set_auto_upgradable_config got unknown kwargs: {extra_kwargs!r}") @@ -2993,7 +2992,7 @@ def set_auto_upgradable_config(self, set_auto_upgradable_config_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3094,7 +3093,7 @@ def summarize_management_agent_counts(self, compartment_id, group_by, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_management_agent_counts got unknown kwargs: {extra_kwargs!r}") @@ -3121,14 +3120,14 @@ def summarize_management_agent_counts(self, compartment_id, group_by, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3218,7 +3217,7 @@ def summarize_management_agent_plugin_counts(self, compartment_id, group_by, **k "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_management_agent_plugin_counts got unknown kwargs: {extra_kwargs!r}") @@ -3235,14 +3234,14 @@ def summarize_management_agent_plugin_counts(self, compartment_id, group_by, **k "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3340,7 +3339,7 @@ def update_data_source(self, management_agent_id, data_source_key, update_data_s "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_data_source got unknown kwargs: {extra_kwargs!r}") @@ -3350,10 +3349,10 @@ def update_data_source(self, management_agent_id, data_source_key, update_data_s "dataSourceKey": data_source_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3363,7 +3362,7 @@ def update_data_source(self, management_agent_id, data_source_key, update_data_s "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3459,7 +3458,7 @@ def update_management_agent(self, management_agent_id, update_management_agent_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_management_agent got unknown kwargs: {extra_kwargs!r}") @@ -3468,10 +3467,10 @@ def update_management_agent(self, management_agent_id, update_management_agent_d "managementAgentId": management_agent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3481,7 +3480,7 @@ def update_management_agent(self, management_agent_id, update_management_agent_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3579,7 +3578,7 @@ def update_management_agent_install_key(self, management_agent_install_key_id, u "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_management_agent_install_key got unknown kwargs: {extra_kwargs!r}") @@ -3588,10 +3587,10 @@ def update_management_agent_install_key(self, management_agent_install_key_id, u "managementAgentInstallKeyId": management_agent_install_key_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3601,7 +3600,7 @@ def update_management_agent_install_key(self, management_agent_install_key_id, u "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/management_dashboard/dashx_apis_client.py b/src/oci/management_dashboard/dashx_apis_client.py index 44cc636ce3..a2d297191f 100644 --- a/src/oci/management_dashboard/dashx_apis_client.py +++ b/src/oci/management_dashboard/dashx_apis_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_management_dashboards_compartment(self, management_dashboard_id, chan "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_management_dashboards_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_management_dashboards_compartment(self, management_dashboard_id, chan "managementDashboardId": management_dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_management_dashboards_compartment(self, management_dashboard_id, chan "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -297,7 +296,7 @@ def change_management_saved_searches_compartment(self, management_saved_search_i "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_management_saved_searches_compartment got unknown kwargs: {extra_kwargs!r}") @@ -306,10 +305,10 @@ def change_management_saved_searches_compartment(self, management_saved_search_i "managementSavedSearchId": management_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -319,7 +318,7 @@ def change_management_saved_searches_compartment(self, management_saved_search_i "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -409,7 +408,7 @@ def create_management_dashboard(self, create_management_dashboard_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_management_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -420,7 +419,7 @@ def create_management_dashboard(self, create_management_dashboard_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -508,7 +507,7 @@ def create_management_saved_search(self, create_management_saved_search_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_management_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -519,7 +518,7 @@ def create_management_saved_search(self, create_management_saved_search_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -604,7 +603,7 @@ def delete_management_dashboard(self, management_dashboard_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_management_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -613,10 +612,10 @@ def delete_management_dashboard(self, management_dashboard_id, **kwargs): "managementDashboardId": management_dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -625,7 +624,7 @@ def delete_management_dashboard(self, management_dashboard_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -707,7 +706,7 @@ def delete_management_saved_search(self, management_saved_search_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_management_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -716,10 +715,10 @@ def delete_management_saved_search(self, management_saved_search_id, **kwargs): "managementSavedSearchId": management_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -728,7 +727,7 @@ def delete_management_saved_search(self, management_saved_search_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -812,7 +811,7 @@ def export_dashboard(self, export_dashboard_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -821,10 +820,10 @@ def export_dashboard(self, export_dashboard_id, **kwargs): "exportDashboardId": export_dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -833,7 +832,7 @@ def export_dashboard(self, export_dashboard_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -918,7 +917,7 @@ def get_management_dashboard(self, management_dashboard_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -927,10 +926,10 @@ def get_management_dashboard(self, management_dashboard_id, **kwargs): "managementDashboardId": management_dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -939,7 +938,7 @@ def get_management_dashboard(self, management_dashboard_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1024,7 +1023,7 @@ def get_management_saved_search(self, management_saved_search_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -1033,10 +1032,10 @@ def get_management_saved_search(self, management_saved_search_id, **kwargs): "managementSavedSearchId": management_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1045,7 +1044,7 @@ def get_management_saved_search(self, management_saved_search_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1143,7 +1142,7 @@ def import_dashboard(self, management_dashboard_import_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -1155,7 +1154,7 @@ def import_dashboard(self, management_dashboard_import_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1254,7 +1253,7 @@ def list_management_dashboards(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_dashboards got unknown kwargs: {extra_kwargs!r}") @@ -1281,14 +1280,14 @@ def list_management_dashboards(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1388,7 +1387,7 @@ def list_management_saved_searches(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_saved_searches got unknown kwargs: {extra_kwargs!r}") @@ -1415,14 +1414,14 @@ def list_management_saved_searches(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1517,7 +1516,7 @@ def update_management_dashboard(self, management_dashboard_id, update_management "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_management_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -1526,10 +1525,10 @@ def update_management_dashboard(self, management_dashboard_id, update_management "managementDashboardId": management_dashboard_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1539,7 +1538,7 @@ def update_management_dashboard(self, management_dashboard_id, update_management "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1637,7 +1636,7 @@ def update_management_saved_search(self, management_saved_search_id, update_mana "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_management_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -1646,10 +1645,10 @@ def update_management_saved_search(self, management_saved_search_id, update_mana "managementSavedSearchId": management_saved_search_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1659,7 +1658,7 @@ def update_management_saved_search(self, management_saved_search_id, update_mana "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/marketplace/account_client.py b/src/oci/marketplace/account_client.py index e2c0c5de1a..45106707a1 100644 --- a/src/oci/marketplace/account_client.py +++ b/src/oci/marketplace/account_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def get_launch_eligibility(self, compartment_id, image_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_launch_eligibility got unknown kwargs: {extra_kwargs!r}") @@ -171,14 +170,14 @@ def get_launch_eligibility(self, compartment_id, image_id, **kwargs): "compartmentId": compartment_id, "imageId": image_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -257,7 +256,7 @@ def get_third_party_paid_listing_eligibility(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_third_party_paid_listing_eligibility got unknown kwargs: {extra_kwargs!r}") @@ -265,14 +264,14 @@ def get_third_party_paid_listing_eligibility(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/marketplace/marketplace_client.py b/src/oci/marketplace/marketplace_client.py index afc853fe05..10d5f47cbb 100644 --- a/src/oci/marketplace/marketplace_client.py +++ b/src/oci/marketplace/marketplace_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def change_publication_compartment(self, publication_id, change_publication_comp "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_publication_compartment got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def change_publication_compartment(self, publication_id, change_publication_comp "publicationId": publication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -197,7 +196,7 @@ def change_publication_compartment(self, publication_id, change_publication_comp "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -285,7 +284,7 @@ def create_accepted_agreement(self, create_accepted_agreement_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_accepted_agreement got unknown kwargs: {extra_kwargs!r}") @@ -296,7 +295,7 @@ def create_accepted_agreement(self, create_accepted_agreement_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def create_publication(self, create_publication_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_publication got unknown kwargs: {extra_kwargs!r}") @@ -394,7 +393,7 @@ def create_publication(self, create_publication_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -486,7 +485,7 @@ def delete_accepted_agreement(self, accepted_agreement_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_accepted_agreement got unknown kwargs: {extra_kwargs!r}") @@ -495,16 +494,16 @@ def delete_accepted_agreement(self, accepted_agreement_id, **kwargs): "acceptedAgreementId": accepted_agreement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "signature": kwargs.get("signature", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -512,7 +511,7 @@ def delete_accepted_agreement(self, accepted_agreement_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -597,7 +596,7 @@ def delete_publication(self, publication_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_publication got unknown kwargs: {extra_kwargs!r}") @@ -606,10 +605,10 @@ def delete_publication(self, publication_id, **kwargs): "publicationId": publication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -618,7 +617,7 @@ def delete_publication(self, publication_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -708,7 +707,7 @@ def export_listing(self, listing_id, package_version, export_package_details, ** "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_listing got unknown kwargs: {extra_kwargs!r}") @@ -718,10 +717,10 @@ def export_listing(self, listing_id, package_version, export_package_details, ** "packageVersion": package_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -730,7 +729,7 @@ def export_listing(self, listing_id, package_version, export_package_details, ** "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -812,7 +811,7 @@ def get_accepted_agreement(self, accepted_agreement_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_accepted_agreement got unknown kwargs: {extra_kwargs!r}") @@ -821,10 +820,10 @@ def get_accepted_agreement(self, accepted_agreement_id, **kwargs): "acceptedAgreementId": accepted_agreement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -832,7 +831,7 @@ def get_accepted_agreement(self, accepted_agreement_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -922,7 +921,7 @@ def get_agreement(self, listing_id, package_version, agreement_id, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_agreement got unknown kwargs: {extra_kwargs!r}") @@ -933,23 +932,23 @@ def get_agreement(self, listing_id, package_version, agreement_id, **kwargs): "agreementId": agreement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1054,7 +1053,7 @@ def get_listing(self, listing_id, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing got unknown kwargs: {extra_kwargs!r}") @@ -1063,23 +1062,23 @@ def get_listing(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1186,7 +1185,7 @@ def get_package(self, listing_id, package_version, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_package got unknown kwargs: {extra_kwargs!r}") @@ -1196,23 +1195,23 @@ def get_package(self, listing_id, package_version, **kwargs): "packageVersion": package_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1293,7 +1292,7 @@ def get_publication(self, publication_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_publication got unknown kwargs: {extra_kwargs!r}") @@ -1302,10 +1301,10 @@ def get_publication(self, publication_id, **kwargs): "publicationId": publication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1313,7 +1312,7 @@ def get_publication(self, publication_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1395,7 +1394,7 @@ def get_publication_package(self, publication_id, package_version, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_publication_package got unknown kwargs: {extra_kwargs!r}") @@ -1405,10 +1404,10 @@ def get_publication_package(self, publication_id, package_version, **kwargs): "packageVersion": package_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1416,7 +1415,7 @@ def get_publication_package(self, publication_id, package_version, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1495,7 +1494,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1504,10 +1503,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1515,7 +1514,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1633,7 +1632,7 @@ def list_accepted_agreements(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_accepted_agreements got unknown kwargs: {extra_kwargs!r}") @@ -1663,14 +1662,14 @@ def list_accepted_agreements(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1764,7 +1763,7 @@ def list_agreements(self, listing_id, package_version, **kwargs): "page", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_agreements got unknown kwargs: {extra_kwargs!r}") @@ -1774,10 +1773,10 @@ def list_agreements(self, listing_id, package_version, **kwargs): "packageVersion": package_version } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1785,14 +1784,14 @@ def list_agreements(self, listing_id, package_version, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1883,7 +1882,7 @@ def list_categories(self, **kwargs): "page", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_categories got unknown kwargs: {extra_kwargs!r}") @@ -1893,14 +1892,14 @@ def list_categories(self, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2068,7 +2067,7 @@ def list_listings(self, **kwargs): "operating_systems", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listings got unknown kwargs: {extra_kwargs!r}") @@ -2120,14 +2119,14 @@ def list_listings(self, **kwargs): "operatingSystems": self.base_client.generate_collection_format_param(kwargs.get("operating_systems", missing), 'multi'), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2259,7 +2258,7 @@ def list_packages(self, listing_id, **kwargs): "sort_order", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_packages got unknown kwargs: {extra_kwargs!r}") @@ -2268,10 +2267,10 @@ def list_packages(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2297,14 +2296,14 @@ def list_packages(self, listing_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2415,7 +2414,7 @@ def list_publication_packages(self, publication_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_publication_packages got unknown kwargs: {extra_kwargs!r}") @@ -2424,10 +2423,10 @@ def list_publication_packages(self, publication_id, **kwargs): "publicationId": publication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2452,14 +2451,14 @@ def list_publication_packages(self, publication_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2579,7 +2578,7 @@ def list_publications(self, compartment_id, listing_type, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_publications got unknown kwargs: {extra_kwargs!r}") @@ -2615,14 +2614,14 @@ def list_publications(self, compartment_id, listing_type, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2714,7 +2713,7 @@ def list_publishers(self, **kwargs): "page", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_publishers got unknown kwargs: {extra_kwargs!r}") @@ -2725,14 +2724,14 @@ def list_publishers(self, **kwargs): "page": kwargs.get("page", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2815,7 +2814,7 @@ def list_report_types(self, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_report_types got unknown kwargs: {extra_kwargs!r}") @@ -2824,14 +2823,14 @@ def list_report_types(self, compartment_id, **kwargs): "compartmentId": compartment_id, "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2922,7 +2921,7 @@ def list_reports(self, report_type, date, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_reports got unknown kwargs: {extra_kwargs!r}") @@ -2933,14 +2932,14 @@ def list_reports(self, report_type, date, compartment_id, **kwargs): "compartmentId": compartment_id, "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3023,7 +3022,7 @@ def list_taxes(self, listing_id, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_taxes got unknown kwargs: {extra_kwargs!r}") @@ -3032,23 +3031,23 @@ def list_taxes(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3149,7 +3148,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3158,10 +3157,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3184,14 +3183,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3292,7 +3291,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3301,10 +3300,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -3327,14 +3326,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3445,7 +3444,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3480,14 +3479,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3575,7 +3574,7 @@ def search_listings(self, search_listings_details, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_listings got unknown kwargs: {extra_kwargs!r}") @@ -3584,14 +3583,14 @@ def search_listings(self, search_listings_details, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3688,7 +3687,7 @@ def update_accepted_agreement(self, accepted_agreement_id, update_accepted_agree "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_accepted_agreement got unknown kwargs: {extra_kwargs!r}") @@ -3697,10 +3696,10 @@ def update_accepted_agreement(self, accepted_agreement_id, update_accepted_agree "acceptedAgreementId": accepted_agreement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3710,7 +3709,7 @@ def update_accepted_agreement(self, accepted_agreement_id, update_accepted_agree "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3808,7 +3807,7 @@ def update_publication(self, publication_id, update_publication_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_publication got unknown kwargs: {extra_kwargs!r}") @@ -3817,10 +3816,10 @@ def update_publication(self, publication_id, update_publication_details, **kwarg "publicationId": publication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3830,7 +3829,7 @@ def update_publication(self, publication_id, update_publication_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/marketplace_publisher/marketplace_publisher_client.py b/src/oci/marketplace_publisher/marketplace_publisher_client.py index b6219707ab..c76d6cba80 100644 --- a/src/oci/marketplace_publisher/marketplace_publisher_client.py +++ b/src/oci/marketplace_publisher/marketplace_publisher_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def activate_term_version(self, term_version_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_term_version got unknown kwargs: {extra_kwargs!r}") @@ -176,10 +175,10 @@ def activate_term_version(self, term_version_id, **kwargs): "termVersionId": term_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -188,7 +187,7 @@ def activate_term_version(self, term_version_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -274,7 +273,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -283,10 +282,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -295,7 +294,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -387,7 +386,7 @@ def cascading_delete_listing(self, listing_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cascading_delete_listing got unknown kwargs: {extra_kwargs!r}") @@ -396,10 +395,10 @@ def cascading_delete_listing(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -409,7 +408,7 @@ def cascading_delete_listing(self, listing_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -502,7 +501,7 @@ def cascading_delete_listing_revision(self, listing_revision_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cascading_delete_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -511,10 +510,10 @@ def cascading_delete_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -524,7 +523,7 @@ def cascading_delete_listing_revision(self, listing_revision_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -620,7 +619,7 @@ def change_artifact_compartment(self, artifact_id, change_artifact_compartment_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_artifact_compartment got unknown kwargs: {extra_kwargs!r}") @@ -629,10 +628,10 @@ def change_artifact_compartment(self, artifact_id, change_artifact_compartment_d "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -642,7 +641,7 @@ def change_artifact_compartment(self, artifact_id, change_artifact_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -740,7 +739,7 @@ def change_listing_compartment(self, listing_id, change_listing_compartment_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_listing_compartment got unknown kwargs: {extra_kwargs!r}") @@ -749,10 +748,10 @@ def change_listing_compartment(self, listing_id, change_listing_compartment_deta "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -762,7 +761,7 @@ def change_listing_compartment(self, listing_id, change_listing_compartment_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -849,7 +848,7 @@ def change_listing_revision_to_new_status(self, listing_revision_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_listing_revision_to_new_status got unknown kwargs: {extra_kwargs!r}") @@ -858,10 +857,10 @@ def change_listing_revision_to_new_status(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -870,7 +869,7 @@ def change_listing_revision_to_new_status(self, listing_revision_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -967,7 +966,7 @@ def change_term_compartment(self, term_id, change_term_compartment_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_term_compartment got unknown kwargs: {extra_kwargs!r}") @@ -976,10 +975,10 @@ def change_term_compartment(self, term_id, change_term_compartment_details, **kw "termId": term_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -989,7 +988,7 @@ def change_term_compartment(self, term_id, change_term_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1084,7 +1083,7 @@ def clone_listing_revision(self, listing_revision_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clone_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -1093,10 +1092,10 @@ def clone_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1106,7 +1105,7 @@ def clone_listing_revision(self, listing_revision_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1203,7 +1202,7 @@ def create_artifact(self, create_artifact_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_artifact got unknown kwargs: {extra_kwargs!r}") @@ -1214,7 +1213,7 @@ def create_artifact(self, create_artifact_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1307,7 +1306,7 @@ def create_listing(self, create_listing_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listing got unknown kwargs: {extra_kwargs!r}") @@ -1318,7 +1317,7 @@ def create_listing(self, create_listing_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1405,7 +1404,7 @@ def create_listing_revision(self, create_listing_revision_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -1416,7 +1415,7 @@ def create_listing_revision(self, create_listing_revision_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1503,7 +1502,7 @@ def create_listing_revision_attachment(self, create_listing_revision_attachment_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listing_revision_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1514,7 +1513,7 @@ def create_listing_revision_attachment(self, create_listing_revision_attachment_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1601,7 +1600,7 @@ def create_listing_revision_note(self, create_listing_revision_note_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listing_revision_note got unknown kwargs: {extra_kwargs!r}") @@ -1612,7 +1611,7 @@ def create_listing_revision_note(self, create_listing_revision_note_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1699,7 +1698,7 @@ def create_listing_revision_package(self, create_listing_revision_package_detail "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -1710,7 +1709,7 @@ def create_listing_revision_package(self, create_listing_revision_package_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1797,7 +1796,7 @@ def create_term(self, create_term_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_term got unknown kwargs: {extra_kwargs!r}") @@ -1808,7 +1807,7 @@ def create_term(self, create_term_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1910,7 +1909,7 @@ def create_term_version(self, create_term_version_content, term_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_term_version got unknown kwargs: {extra_kwargs!r}") @@ -1922,7 +1921,7 @@ def create_term_version(self, create_term_version_content, term_id, **kwargs): "display-name": kwargs.get("display_name", missing), "term-id": term_id } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1931,7 +1930,7 @@ def create_term_version(self, create_term_version_content, term_id, **kwargs): create_term_version_content = kwargs.get("create_term_version_content", missing) if create_term_version_content is not missing and create_term_version_content is not None: - if (not isinstance(create_term_version_content, (six.binary_type, six.string_types)) and + if (not isinstance(create_term_version_content, (bytes, str)) and not hasattr(create_term_version_content, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2038,7 +2037,7 @@ def delete_artifact(self, artifact_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_artifact got unknown kwargs: {extra_kwargs!r}") @@ -2047,10 +2046,10 @@ def delete_artifact(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2060,7 +2059,7 @@ def delete_artifact(self, artifact_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2145,7 +2144,7 @@ def delete_listing(self, listing_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listing got unknown kwargs: {extra_kwargs!r}") @@ -2154,10 +2153,10 @@ def delete_listing(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2166,7 +2165,7 @@ def delete_listing(self, listing_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2250,7 +2249,7 @@ def delete_listing_revision(self, listing_revision_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -2259,10 +2258,10 @@ def delete_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2271,7 +2270,7 @@ def delete_listing_revision(self, listing_revision_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2355,7 +2354,7 @@ def delete_listing_revision_attachment(self, listing_revision_attachment_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listing_revision_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2364,10 +2363,10 @@ def delete_listing_revision_attachment(self, listing_revision_attachment_id, **k "listingRevisionAttachmentId": listing_revision_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2376,7 +2375,7 @@ def delete_listing_revision_attachment(self, listing_revision_attachment_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2460,7 +2459,7 @@ def delete_listing_revision_note(self, listing_revision_note_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listing_revision_note got unknown kwargs: {extra_kwargs!r}") @@ -2469,10 +2468,10 @@ def delete_listing_revision_note(self, listing_revision_note_id, **kwargs): "listingRevisionNoteId": listing_revision_note_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2481,7 +2480,7 @@ def delete_listing_revision_note(self, listing_revision_note_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2565,7 +2564,7 @@ def delete_listing_revision_package(self, listing_revision_package_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -2574,10 +2573,10 @@ def delete_listing_revision_package(self, listing_revision_package_id, **kwargs) "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2586,7 +2585,7 @@ def delete_listing_revision_package(self, listing_revision_package_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2670,7 +2669,7 @@ def delete_term(self, term_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_term got unknown kwargs: {extra_kwargs!r}") @@ -2679,10 +2678,10 @@ def delete_term(self, term_id, **kwargs): "termId": term_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2691,7 +2690,7 @@ def delete_term(self, term_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2775,7 +2774,7 @@ def delete_term_version(self, term_version_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_term_version got unknown kwargs: {extra_kwargs!r}") @@ -2784,10 +2783,10 @@ def delete_term_version(self, term_version_id, **kwargs): "termVersionId": term_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2796,7 +2795,7 @@ def delete_term_version(self, term_version_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2872,7 +2871,7 @@ def get_artifact(self, artifact_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_artifact got unknown kwargs: {extra_kwargs!r}") @@ -2881,10 +2880,10 @@ def get_artifact(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2892,7 +2891,7 @@ def get_artifact(self, artifact_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2973,7 +2972,7 @@ def get_category(self, category_code, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_category got unknown kwargs: {extra_kwargs!r}") @@ -2982,23 +2981,23 @@ def get_category(self, category_code, compartment_id, **kwargs): "categoryCode": category_code } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3078,7 +3077,7 @@ def get_listing(self, listing_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing got unknown kwargs: {extra_kwargs!r}") @@ -3087,10 +3086,10 @@ def get_listing(self, listing_id, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3098,7 +3097,7 @@ def get_listing(self, listing_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3176,7 +3175,7 @@ def get_listing_revision(self, listing_revision_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -3185,10 +3184,10 @@ def get_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3196,7 +3195,7 @@ def get_listing_revision(self, listing_revision_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3274,7 +3273,7 @@ def get_listing_revision_attachment(self, listing_revision_attachment_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing_revision_attachment got unknown kwargs: {extra_kwargs!r}") @@ -3283,10 +3282,10 @@ def get_listing_revision_attachment(self, listing_revision_attachment_id, **kwar "listingRevisionAttachmentId": listing_revision_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3294,7 +3293,7 @@ def get_listing_revision_attachment(self, listing_revision_attachment_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3372,7 +3371,7 @@ def get_listing_revision_note(self, listing_revision_note_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing_revision_note got unknown kwargs: {extra_kwargs!r}") @@ -3381,10 +3380,10 @@ def get_listing_revision_note(self, listing_revision_note_id, **kwargs): "listingRevisionNoteId": listing_revision_note_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3392,7 +3391,7 @@ def get_listing_revision_note(self, listing_revision_note_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3470,7 +3469,7 @@ def get_listing_revision_package(self, listing_revision_package_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -3479,10 +3478,10 @@ def get_listing_revision_package(self, listing_revision_package_id, **kwargs): "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3490,7 +3489,7 @@ def get_listing_revision_package(self, listing_revision_package_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3568,7 +3567,7 @@ def get_market(self, market_code, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_market got unknown kwargs: {extra_kwargs!r}") @@ -3577,10 +3576,10 @@ def get_market(self, market_code, **kwargs): "marketCode": market_code } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3588,7 +3587,7 @@ def get_market(self, market_code, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3666,7 +3665,7 @@ def get_product(self, product_code, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_product got unknown kwargs: {extra_kwargs!r}") @@ -3675,10 +3674,10 @@ def get_product(self, product_code, **kwargs): "productCode": product_code } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3686,7 +3685,7 @@ def get_product(self, product_code, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3764,7 +3763,7 @@ def get_publisher(self, publisher_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_publisher got unknown kwargs: {extra_kwargs!r}") @@ -3773,10 +3772,10 @@ def get_publisher(self, publisher_id, **kwargs): "publisherId": publisher_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3784,7 +3783,7 @@ def get_publisher(self, publisher_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3862,7 +3861,7 @@ def get_term(self, term_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_term got unknown kwargs: {extra_kwargs!r}") @@ -3871,10 +3870,10 @@ def get_term(self, term_id, **kwargs): "termId": term_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3882,7 +3881,7 @@ def get_term(self, term_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3960,7 +3959,7 @@ def get_term_version(self, term_version_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_term_version got unknown kwargs: {extra_kwargs!r}") @@ -3969,10 +3968,10 @@ def get_term_version(self, term_version_id, **kwargs): "termVersionId": term_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3980,7 +3979,7 @@ def get_term_version(self, term_version_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4058,7 +4057,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -4067,10 +4066,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4078,7 +4077,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4194,7 +4193,7 @@ def list_artifacts(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_artifacts got unknown kwargs: {extra_kwargs!r}") @@ -4237,14 +4236,14 @@ def list_artifacts(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4352,7 +4351,7 @@ def list_categories(self, compartment_id, **kwargs): "opc_request_id", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_categories got unknown kwargs: {extra_kwargs!r}") @@ -4380,14 +4379,14 @@ def list_categories(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4499,7 +4498,7 @@ def list_listing_revision_attachments(self, listing_revision_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listing_revision_attachments got unknown kwargs: {extra_kwargs!r}") @@ -4535,14 +4534,14 @@ def list_listing_revision_attachments(self, listing_revision_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4644,7 +4643,7 @@ def list_listing_revision_notes(self, listing_revision_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listing_revision_notes got unknown kwargs: {extra_kwargs!r}") @@ -4671,14 +4670,14 @@ def list_listing_revision_notes(self, listing_revision_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4790,7 +4789,7 @@ def list_listing_revision_packages(self, listing_revision_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listing_revision_packages got unknown kwargs: {extra_kwargs!r}") @@ -4826,14 +4825,14 @@ def list_listing_revision_packages(self, listing_revision_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4954,7 +4953,7 @@ def list_listing_revisions(self, listing_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listing_revisions got unknown kwargs: {extra_kwargs!r}") @@ -4998,14 +4997,14 @@ def list_listing_revisions(self, listing_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5115,7 +5114,7 @@ def list_listings(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listings got unknown kwargs: {extra_kwargs!r}") @@ -5150,14 +5149,14 @@ def list_listings(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5261,7 +5260,7 @@ def list_markets(self, compartment_id, **kwargs): "opc_request_id", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_markets got unknown kwargs: {extra_kwargs!r}") @@ -5288,14 +5287,14 @@ def list_markets(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5399,7 +5398,7 @@ def list_products(self, compartment_id, **kwargs): "opc_request_id", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_products got unknown kwargs: {extra_kwargs!r}") @@ -5426,14 +5425,14 @@ def list_products(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5535,7 +5534,7 @@ def list_publishers(self, compartment_id, **kwargs): "opc_request_id", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_publishers got unknown kwargs: {extra_kwargs!r}") @@ -5562,14 +5561,14 @@ def list_publishers(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5675,7 +5674,7 @@ def list_term_versions(self, term_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_term_versions got unknown kwargs: {extra_kwargs!r}") @@ -5703,14 +5702,14 @@ def list_term_versions(self, term_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5812,7 +5811,7 @@ def list_terms(self, compartment_id, **kwargs): "opc_request_id", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_terms got unknown kwargs: {extra_kwargs!r}") @@ -5839,14 +5838,14 @@ def list_terms(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5944,7 +5943,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -5953,10 +5952,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -5979,14 +5978,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6086,7 +6085,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -6095,10 +6094,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -6121,14 +6120,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6242,7 +6241,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -6278,14 +6277,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6379,7 +6378,7 @@ def mark_listing_revision_package_as_default(self, listing_revision_package_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"mark_listing_revision_package_as_default got unknown kwargs: {extra_kwargs!r}") @@ -6388,10 +6387,10 @@ def mark_listing_revision_package_as_default(self, listing_revision_package_id, "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6401,7 +6400,7 @@ def mark_listing_revision_package_as_default(self, listing_revision_package_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6494,7 +6493,7 @@ def publish_listing_revision(self, listing_revision_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -6503,10 +6502,10 @@ def publish_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6516,7 +6515,7 @@ def publish_listing_revision(self, listing_revision_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6612,7 +6611,7 @@ def publish_listing_revision_as_private(self, publish_listing_revision_as_privat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_listing_revision_as_private got unknown kwargs: {extra_kwargs!r}") @@ -6621,10 +6620,10 @@ def publish_listing_revision_as_private(self, publish_listing_revision_as_privat "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6634,7 +6633,7 @@ def publish_listing_revision_as_private(self, publish_listing_revision_as_privat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6729,7 +6728,7 @@ def publish_listing_revision_package(self, listing_revision_package_id, **kwargs "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -6738,10 +6737,10 @@ def publish_listing_revision_package(self, listing_revision_package_id, **kwargs "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6751,7 +6750,7 @@ def publish_listing_revision_package(self, listing_revision_package_id, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6847,7 +6846,7 @@ def submit_listing_revision_for_review(self, submit_listing_revision_for_review_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"submit_listing_revision_for_review got unknown kwargs: {extra_kwargs!r}") @@ -6856,10 +6855,10 @@ def submit_listing_revision_for_review(self, submit_listing_revision_for_review_ "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6869,7 +6868,7 @@ def submit_listing_revision_for_review(self, submit_listing_revision_for_review_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6966,7 +6965,7 @@ def un_publish_listing_revision_package(self, listing_revision_package_id, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"un_publish_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -6975,10 +6974,10 @@ def un_publish_listing_revision_package(self, listing_revision_package_id, **kwa "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6988,7 +6987,7 @@ def un_publish_listing_revision_package(self, listing_revision_package_id, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7076,7 +7075,7 @@ def update_artifact(self, artifact_id, update_artifact_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_artifact got unknown kwargs: {extra_kwargs!r}") @@ -7085,10 +7084,10 @@ def update_artifact(self, artifact_id, update_artifact_details, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7097,7 +7096,7 @@ def update_artifact(self, artifact_id, update_artifact_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7186,7 +7185,7 @@ def update_listing(self, listing_id, update_listing_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing got unknown kwargs: {extra_kwargs!r}") @@ -7195,10 +7194,10 @@ def update_listing(self, listing_id, update_listing_details, **kwargs): "listingId": listing_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7207,7 +7206,7 @@ def update_listing(self, listing_id, update_listing_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7298,7 +7297,7 @@ def update_listing_revision(self, listing_revision_id, update_listing_revision_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -7307,10 +7306,10 @@ def update_listing_revision(self, listing_revision_id, update_listing_revision_d "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7319,7 +7318,7 @@ def update_listing_revision(self, listing_revision_id, update_listing_revision_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7410,7 +7409,7 @@ def update_listing_revision_attachment(self, listing_revision_attachment_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing_revision_attachment got unknown kwargs: {extra_kwargs!r}") @@ -7419,10 +7418,10 @@ def update_listing_revision_attachment(self, listing_revision_attachment_id, upd "listingRevisionAttachmentId": listing_revision_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7431,7 +7430,7 @@ def update_listing_revision_attachment(self, listing_revision_attachment_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7530,7 +7529,7 @@ def update_listing_revision_attachment_content(self, listing_revision_attachment "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing_revision_attachment_content got unknown kwargs: {extra_kwargs!r}") @@ -7539,10 +7538,10 @@ def update_listing_revision_attachment_content(self, listing_revision_attachment "listingRevisionAttachmentId": listing_revision_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7550,7 +7549,7 @@ def update_listing_revision_attachment_content(self, listing_revision_attachment "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -7559,7 +7558,7 @@ def update_listing_revision_attachment_content(self, listing_revision_attachment update_listing_revision_attachment_content = kwargs.get("update_listing_revision_attachment_content", missing) if update_listing_revision_attachment_content is not missing and update_listing_revision_attachment_content is not None: - if (not isinstance(update_listing_revision_attachment_content, (six.binary_type, six.string_types)) and + if (not isinstance(update_listing_revision_attachment_content, (bytes, str)) and not hasattr(update_listing_revision_attachment_content, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -7670,7 +7669,7 @@ def update_listing_revision_icon_content(self, listing_revision_id, update_listi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing_revision_icon_content got unknown kwargs: {extra_kwargs!r}") @@ -7679,10 +7678,10 @@ def update_listing_revision_icon_content(self, listing_revision_id, update_listi "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7690,7 +7689,7 @@ def update_listing_revision_icon_content(self, listing_revision_id, update_listi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -7699,7 +7698,7 @@ def update_listing_revision_icon_content(self, listing_revision_id, update_listi update_listing_revision_icon_content = kwargs.get("update_listing_revision_icon_content", missing) if update_listing_revision_icon_content is not missing and update_listing_revision_icon_content is not None: - if (not isinstance(update_listing_revision_icon_content, (six.binary_type, six.string_types)) and + if (not isinstance(update_listing_revision_icon_content, (bytes, str)) and not hasattr(update_listing_revision_icon_content, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -7802,7 +7801,7 @@ def update_listing_revision_package(self, listing_revision_package_id, update_li "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listing_revision_package got unknown kwargs: {extra_kwargs!r}") @@ -7811,10 +7810,10 @@ def update_listing_revision_package(self, listing_revision_package_id, update_li "listingRevisionPackageId": listing_revision_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7823,7 +7822,7 @@ def update_listing_revision_package(self, listing_revision_package_id, update_li "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7914,7 +7913,7 @@ def update_term(self, term_id, update_term_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_term got unknown kwargs: {extra_kwargs!r}") @@ -7923,10 +7922,10 @@ def update_term(self, term_id, update_term_details, **kwargs): "termId": term_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7935,7 +7934,7 @@ def update_term(self, term_id, update_term_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8026,7 +8025,7 @@ def update_term_version(self, term_version_id, update_term_version_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_term_version got unknown kwargs: {extra_kwargs!r}") @@ -8035,10 +8034,10 @@ def update_term_version(self, term_version_id, update_term_version_details, **kw "termVersionId": term_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8047,7 +8046,7 @@ def update_term_version(self, term_version_id, update_term_version_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8150,7 +8149,7 @@ def update_term_version_content(self, term_version_id, update_term_version_conte "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_term_version_content got unknown kwargs: {extra_kwargs!r}") @@ -8159,10 +8158,10 @@ def update_term_version_content(self, term_version_id, update_term_version_conte "termVersionId": term_version_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8171,7 +8170,7 @@ def update_term_version_content(self, term_version_id, update_term_version_conte "opc-request-id": kwargs.get("opc_request_id", missing), "display-name": kwargs.get("display_name", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -8180,7 +8179,7 @@ def update_term_version_content(self, term_version_id, update_term_version_conte update_term_version_content = kwargs.get("update_term_version_content", missing) if update_term_version_content is not missing and update_term_version_content is not None: - if (not isinstance(update_term_version_content, (six.binary_type, six.string_types)) and + if (not isinstance(update_term_version_content, (bytes, str)) and not hasattr(update_term_version_content, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -8288,7 +8287,7 @@ def validate_and_publish_artifact(self, artifact_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_and_publish_artifact got unknown kwargs: {extra_kwargs!r}") @@ -8297,10 +8296,10 @@ def validate_and_publish_artifact(self, artifact_id, **kwargs): "artifactId": artifact_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8310,7 +8309,7 @@ def validate_and_publish_artifact(self, artifact_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8403,7 +8402,7 @@ def withdraw_listing_revision(self, listing_revision_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"withdraw_listing_revision got unknown kwargs: {extra_kwargs!r}") @@ -8412,10 +8411,10 @@ def withdraw_listing_revision(self, listing_revision_id, **kwargs): "listingRevisionId": listing_revision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8425,7 +8424,7 @@ def withdraw_listing_revision(self, listing_revision_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/media_services/media_services_client.py b/src/oci/media_services/media_services_client.py index dfe6a99773..57460a7698 100644 --- a/src/oci/media_services/media_services_client.py +++ b/src/oci/media_services/media_services_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def add_media_asset_lock(self, add_lock_details, media_asset_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_media_asset_lock got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def add_media_asset_lock(self, add_lock_details, media_asset_id, **kwargs): "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def add_media_asset_lock(self, add_lock_details, media_asset_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -301,7 +300,7 @@ def add_media_workflow_configuration_lock(self, add_resource_lock_details, media "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_media_workflow_configuration_lock got unknown kwargs: {extra_kwargs!r}") @@ -310,10 +309,10 @@ def add_media_workflow_configuration_lock(self, add_resource_lock_details, media "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -323,7 +322,7 @@ def add_media_workflow_configuration_lock(self, add_resource_lock_details, media "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -423,7 +422,7 @@ def add_media_workflow_job_lock(self, add_lock_details, media_workflow_job_id, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_media_workflow_job_lock got unknown kwargs: {extra_kwargs!r}") @@ -432,10 +431,10 @@ def add_media_workflow_job_lock(self, add_lock_details, media_workflow_job_id, * "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -445,7 +444,7 @@ def add_media_workflow_job_lock(self, add_lock_details, media_workflow_job_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -545,7 +544,7 @@ def add_media_workflow_lock(self, add_resource_lock_details, media_workflow_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_media_workflow_lock got unknown kwargs: {extra_kwargs!r}") @@ -554,10 +553,10 @@ def add_media_workflow_lock(self, add_resource_lock_details, media_workflow_id, "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -567,7 +566,7 @@ def add_media_workflow_lock(self, add_resource_lock_details, media_workflow_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -667,7 +666,7 @@ def add_stream_cdn_config_lock(self, add_resource_lock_details, stream_cdn_confi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_stream_cdn_config_lock got unknown kwargs: {extra_kwargs!r}") @@ -676,10 +675,10 @@ def add_stream_cdn_config_lock(self, add_resource_lock_details, stream_cdn_confi "streamCdnConfigId": stream_cdn_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -689,7 +688,7 @@ def add_stream_cdn_config_lock(self, add_resource_lock_details, stream_cdn_confi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -789,7 +788,7 @@ def add_stream_distribution_channel_lock(self, add_resource_lock_details, stream "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_stream_distribution_channel_lock got unknown kwargs: {extra_kwargs!r}") @@ -798,10 +797,10 @@ def add_stream_distribution_channel_lock(self, add_resource_lock_details, stream "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -811,7 +810,7 @@ def add_stream_distribution_channel_lock(self, add_resource_lock_details, stream "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -911,7 +910,7 @@ def add_stream_packaging_config_lock(self, add_resource_lock_details, stream_pac "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_stream_packaging_config_lock got unknown kwargs: {extra_kwargs!r}") @@ -920,10 +919,10 @@ def add_stream_packaging_config_lock(self, add_resource_lock_details, stream_pac "streamPackagingConfigId": stream_packaging_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -933,7 +932,7 @@ def add_stream_packaging_config_lock(self, add_resource_lock_details, stream_pac "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1037,7 +1036,7 @@ def change_media_asset_compartment(self, media_asset_id, change_media_asset_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_media_asset_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1046,16 +1045,16 @@ def change_media_asset_compartment(self, media_asset_id, change_media_asset_comp "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1064,7 +1063,7 @@ def change_media_asset_compartment(self, media_asset_id, change_media_asset_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1168,7 +1167,7 @@ def change_media_workflow_compartment(self, media_workflow_id, change_media_work "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_media_workflow_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1177,16 +1176,16 @@ def change_media_workflow_compartment(self, media_workflow_id, change_media_work "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1195,7 +1194,7 @@ def change_media_workflow_compartment(self, media_workflow_id, change_media_work "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1299,7 +1298,7 @@ def change_media_workflow_configuration_compartment(self, media_workflow_configu "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_media_workflow_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1308,16 +1307,16 @@ def change_media_workflow_configuration_compartment(self, media_workflow_configu "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1326,7 +1325,7 @@ def change_media_workflow_configuration_compartment(self, media_workflow_configu "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1430,7 +1429,7 @@ def change_media_workflow_job_compartment(self, media_workflow_job_id, change_me "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_media_workflow_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1439,16 +1438,16 @@ def change_media_workflow_job_compartment(self, media_workflow_job_id, change_me "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1457,7 +1456,7 @@ def change_media_workflow_job_compartment(self, media_workflow_job_id, change_me "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1561,7 +1560,7 @@ def change_stream_distribution_channel_compartment(self, stream_distribution_cha "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_stream_distribution_channel_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1570,16 +1569,16 @@ def change_stream_distribution_channel_compartment(self, stream_distribution_cha "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1588,7 +1587,7 @@ def change_stream_distribution_channel_compartment(self, stream_distribution_cha "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1677,7 +1676,7 @@ def create_media_asset(self, create_media_asset_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_media_asset got unknown kwargs: {extra_kwargs!r}") @@ -1688,7 +1687,7 @@ def create_media_asset(self, create_media_asset_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1775,7 +1774,7 @@ def create_media_workflow(self, create_media_workflow_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_media_workflow got unknown kwargs: {extra_kwargs!r}") @@ -1786,7 +1785,7 @@ def create_media_workflow(self, create_media_workflow_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1873,7 +1872,7 @@ def create_media_workflow_configuration(self, create_media_workflow_configuratio "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_media_workflow_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1884,7 +1883,7 @@ def create_media_workflow_configuration(self, create_media_workflow_configuratio "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1971,7 +1970,7 @@ def create_media_workflow_job(self, create_media_workflow_job_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_media_workflow_job got unknown kwargs: {extra_kwargs!r}") @@ -1982,7 +1981,7 @@ def create_media_workflow_job(self, create_media_workflow_job_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2069,7 +2068,7 @@ def create_stream_cdn_config(self, create_stream_cdn_config_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stream_cdn_config got unknown kwargs: {extra_kwargs!r}") @@ -2080,7 +2079,7 @@ def create_stream_cdn_config(self, create_stream_cdn_config_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2167,7 +2166,7 @@ def create_stream_distribution_channel(self, create_stream_distribution_channel_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stream_distribution_channel got unknown kwargs: {extra_kwargs!r}") @@ -2178,7 +2177,7 @@ def create_stream_distribution_channel(self, create_stream_distribution_channel_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2265,7 +2264,7 @@ def create_stream_packaging_config(self, create_stream_packaging_config_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stream_packaging_config got unknown kwargs: {extra_kwargs!r}") @@ -2276,7 +2275,7 @@ def create_stream_packaging_config(self, create_stream_packaging_config_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2373,7 +2372,7 @@ def delete_media_asset(self, media_asset_id, **kwargs): "opc_request_id", "delete_mode" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_media_asset got unknown kwargs: {extra_kwargs!r}") @@ -2382,10 +2381,10 @@ def delete_media_asset(self, media_asset_id, **kwargs): "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'delete_mode' in kwargs: @@ -2399,7 +2398,7 @@ def delete_media_asset(self, media_asset_id, **kwargs): "isLockOverride": kwargs.get("is_lock_override", missing), "deleteMode": kwargs.get("delete_mode", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2407,7 +2406,7 @@ def delete_media_asset(self, media_asset_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2504,7 +2503,7 @@ def delete_media_asset_distribution_channel_attachment(self, media_asset_id, dis "opc_request_id", "version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_media_asset_distribution_channel_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2514,17 +2513,17 @@ def delete_media_asset_distribution_channel_attachment(self, media_asset_id, dis "distributionChannelId": distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing), "version": kwargs.get("version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2532,7 +2531,7 @@ def delete_media_asset_distribution_channel_attachment(self, media_asset_id, dis "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2622,7 +2621,7 @@ def delete_media_workflow(self, media_workflow_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_media_workflow got unknown kwargs: {extra_kwargs!r}") @@ -2631,16 +2630,16 @@ def delete_media_workflow(self, media_workflow_id, **kwargs): "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2648,7 +2647,7 @@ def delete_media_workflow(self, media_workflow_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2738,7 +2737,7 @@ def delete_media_workflow_configuration(self, media_workflow_configuration_id, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_media_workflow_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2747,16 +2746,16 @@ def delete_media_workflow_configuration(self, media_workflow_configuration_id, * "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2764,7 +2763,7 @@ def delete_media_workflow_configuration(self, media_workflow_configuration_id, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2854,7 +2853,7 @@ def delete_media_workflow_job(self, media_workflow_job_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_media_workflow_job got unknown kwargs: {extra_kwargs!r}") @@ -2863,16 +2862,16 @@ def delete_media_workflow_job(self, media_workflow_job_id, **kwargs): "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2880,7 +2879,7 @@ def delete_media_workflow_job(self, media_workflow_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2970,7 +2969,7 @@ def delete_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stream_cdn_config got unknown kwargs: {extra_kwargs!r}") @@ -2979,16 +2978,16 @@ def delete_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "streamCdnConfigId": stream_cdn_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2996,7 +2995,7 @@ def delete_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3086,7 +3085,7 @@ def delete_stream_distribution_channel(self, stream_distribution_channel_id, **k "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stream_distribution_channel got unknown kwargs: {extra_kwargs!r}") @@ -3095,16 +3094,16 @@ def delete_stream_distribution_channel(self, stream_distribution_channel_id, **k "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3112,7 +3111,7 @@ def delete_stream_distribution_channel(self, stream_distribution_channel_id, **k "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3202,7 +3201,7 @@ def delete_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stream_packaging_config got unknown kwargs: {extra_kwargs!r}") @@ -3211,16 +3210,16 @@ def delete_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "streamPackagingConfigId": stream_packaging_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3228,7 +3227,7 @@ def delete_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3306,7 +3305,7 @@ def get_media_asset(self, media_asset_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_media_asset got unknown kwargs: {extra_kwargs!r}") @@ -3315,10 +3314,10 @@ def get_media_asset(self, media_asset_id, **kwargs): "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3326,7 +3325,7 @@ def get_media_asset(self, media_asset_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3411,7 +3410,7 @@ def get_media_asset_distribution_channel_attachment(self, media_asset_id, distri "opc_request_id", "version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_media_asset_distribution_channel_attachment got unknown kwargs: {extra_kwargs!r}") @@ -3421,23 +3420,23 @@ def get_media_asset_distribution_channel_attachment(self, media_asset_id, distri "distributionChannelId": distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "version": kwargs.get("version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3517,7 +3516,7 @@ def get_media_workflow(self, media_workflow_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_media_workflow got unknown kwargs: {extra_kwargs!r}") @@ -3526,10 +3525,10 @@ def get_media_workflow(self, media_workflow_id, **kwargs): "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3537,7 +3536,7 @@ def get_media_workflow(self, media_workflow_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3615,7 +3614,7 @@ def get_media_workflow_configuration(self, media_workflow_configuration_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_media_workflow_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3624,10 +3623,10 @@ def get_media_workflow_configuration(self, media_workflow_configuration_id, **kw "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3635,7 +3634,7 @@ def get_media_workflow_configuration(self, media_workflow_configuration_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3713,7 +3712,7 @@ def get_media_workflow_job(self, media_workflow_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_media_workflow_job got unknown kwargs: {extra_kwargs!r}") @@ -3722,10 +3721,10 @@ def get_media_workflow_job(self, media_workflow_job_id, **kwargs): "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3733,7 +3732,7 @@ def get_media_workflow_job(self, media_workflow_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3811,7 +3810,7 @@ def get_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stream_cdn_config got unknown kwargs: {extra_kwargs!r}") @@ -3820,10 +3819,10 @@ def get_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "streamCdnConfigId": stream_cdn_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3831,7 +3830,7 @@ def get_stream_cdn_config(self, stream_cdn_config_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3909,7 +3908,7 @@ def get_stream_distribution_channel(self, stream_distribution_channel_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stream_distribution_channel got unknown kwargs: {extra_kwargs!r}") @@ -3918,10 +3917,10 @@ def get_stream_distribution_channel(self, stream_distribution_channel_id, **kwar "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3929,7 +3928,7 @@ def get_stream_distribution_channel(self, stream_distribution_channel_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4007,7 +4006,7 @@ def get_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stream_packaging_config got unknown kwargs: {extra_kwargs!r}") @@ -4016,10 +4015,10 @@ def get_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "streamPackagingConfigId": stream_packaging_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4027,7 +4026,7 @@ def get_stream_packaging_config(self, stream_packaging_config_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4116,7 +4115,7 @@ def ingest_stream_distribution_channel(self, stream_distribution_channel_id, ing "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_stream_distribution_channel got unknown kwargs: {extra_kwargs!r}") @@ -4125,10 +4124,10 @@ def ingest_stream_distribution_channel(self, stream_distribution_channel_id, ing "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4137,7 +4136,7 @@ def ingest_stream_distribution_channel(self, stream_distribution_channel_id, ing "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4247,7 +4246,7 @@ def list_media_asset_distribution_channel_attachments(self, media_asset_id, **kw "sort_by", "distribution_channel_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_asset_distribution_channel_attachments got unknown kwargs: {extra_kwargs!r}") @@ -4256,10 +4255,10 @@ def list_media_asset_distribution_channel_attachments(self, media_asset_id, **kw "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4284,14 +4283,14 @@ def list_media_asset_distribution_channel_attachments(self, media_asset_id, **kw "sortBy": kwargs.get("sort_by", missing), "distributionChannelId": kwargs.get("distribution_channel_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4441,7 +4440,7 @@ def list_media_assets(self, **kwargs): "source_media_workflow_id", "source_media_workflow_version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_assets got unknown kwargs: {extra_kwargs!r}") @@ -4492,14 +4491,14 @@ def list_media_assets(self, **kwargs): "sourceMediaWorkflowId": kwargs.get("source_media_workflow_id", missing), "sourceMediaWorkflowVersion": kwargs.get("source_media_workflow_version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4614,7 +4613,7 @@ def list_media_workflow_configurations(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_workflow_configurations got unknown kwargs: {extra_kwargs!r}") @@ -4650,14 +4649,14 @@ def list_media_workflow_configurations(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4775,7 +4774,7 @@ def list_media_workflow_jobs(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_workflow_jobs got unknown kwargs: {extra_kwargs!r}") @@ -4812,14 +4811,14 @@ def list_media_workflow_jobs(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4931,7 +4930,7 @@ def list_media_workflow_task_declarations(self, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_workflow_task_declarations got unknown kwargs: {extra_kwargs!r}") @@ -4960,14 +4959,14 @@ def list_media_workflow_task_declarations(self, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5082,7 +5081,7 @@ def list_media_workflows(self, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_media_workflows got unknown kwargs: {extra_kwargs!r}") @@ -5118,14 +5117,14 @@ def list_media_workflows(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5239,7 +5238,7 @@ def list_stream_cdn_configs(self, distribution_channel_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stream_cdn_configs got unknown kwargs: {extra_kwargs!r}") @@ -5275,14 +5274,14 @@ def list_stream_cdn_configs(self, distribution_channel_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5397,7 +5396,7 @@ def list_stream_distribution_channels(self, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stream_distribution_channels got unknown kwargs: {extra_kwargs!r}") @@ -5433,14 +5432,14 @@ def list_stream_distribution_channels(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5554,7 +5553,7 @@ def list_stream_packaging_configs(self, distribution_channel_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stream_packaging_configs got unknown kwargs: {extra_kwargs!r}") @@ -5590,14 +5589,14 @@ def list_stream_packaging_configs(self, distribution_channel_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5695,7 +5694,7 @@ def list_system_media_workflows(self, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_system_media_workflows got unknown kwargs: {extra_kwargs!r}") @@ -5714,14 +5713,14 @@ def list_system_media_workflows(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5818,7 +5817,7 @@ def remove_media_asset_lock(self, remove_lock_details, media_asset_id, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_media_asset_lock got unknown kwargs: {extra_kwargs!r}") @@ -5827,10 +5826,10 @@ def remove_media_asset_lock(self, remove_lock_details, media_asset_id, **kwargs) "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5840,7 +5839,7 @@ def remove_media_asset_lock(self, remove_lock_details, media_asset_id, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5940,7 +5939,7 @@ def remove_media_workflow_configuration_lock(self, remove_resource_lock_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_media_workflow_configuration_lock got unknown kwargs: {extra_kwargs!r}") @@ -5949,10 +5948,10 @@ def remove_media_workflow_configuration_lock(self, remove_resource_lock_details, "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5962,7 +5961,7 @@ def remove_media_workflow_configuration_lock(self, remove_resource_lock_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6062,7 +6061,7 @@ def remove_media_workflow_job_lock(self, remove_lock_details, media_workflow_job "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_media_workflow_job_lock got unknown kwargs: {extra_kwargs!r}") @@ -6071,10 +6070,10 @@ def remove_media_workflow_job_lock(self, remove_lock_details, media_workflow_job "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6084,7 +6083,7 @@ def remove_media_workflow_job_lock(self, remove_lock_details, media_workflow_job "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6184,7 +6183,7 @@ def remove_media_workflow_lock(self, remove_resource_lock_details, media_workflo "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_media_workflow_lock got unknown kwargs: {extra_kwargs!r}") @@ -6193,10 +6192,10 @@ def remove_media_workflow_lock(self, remove_resource_lock_details, media_workflo "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6206,7 +6205,7 @@ def remove_media_workflow_lock(self, remove_resource_lock_details, media_workflo "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6306,7 +6305,7 @@ def remove_stream_cdn_config_lock(self, remove_resource_lock_details, stream_cdn "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_stream_cdn_config_lock got unknown kwargs: {extra_kwargs!r}") @@ -6315,10 +6314,10 @@ def remove_stream_cdn_config_lock(self, remove_resource_lock_details, stream_cdn "streamCdnConfigId": stream_cdn_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6328,7 +6327,7 @@ def remove_stream_cdn_config_lock(self, remove_resource_lock_details, stream_cdn "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6428,7 +6427,7 @@ def remove_stream_distribution_channel_lock(self, remove_resource_lock_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_stream_distribution_channel_lock got unknown kwargs: {extra_kwargs!r}") @@ -6437,10 +6436,10 @@ def remove_stream_distribution_channel_lock(self, remove_resource_lock_details, "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6450,7 +6449,7 @@ def remove_stream_distribution_channel_lock(self, remove_resource_lock_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6550,7 +6549,7 @@ def remove_stream_packaging_config_lock(self, remove_resource_lock_details, stre "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_stream_packaging_config_lock got unknown kwargs: {extra_kwargs!r}") @@ -6559,10 +6558,10 @@ def remove_stream_packaging_config_lock(self, remove_resource_lock_details, stre "streamPackagingConfigId": stream_packaging_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6572,7 +6571,7 @@ def remove_stream_packaging_config_lock(self, remove_resource_lock_details, stre "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6668,7 +6667,7 @@ def update_media_asset(self, media_asset_id, update_media_asset_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_media_asset got unknown kwargs: {extra_kwargs!r}") @@ -6677,16 +6676,16 @@ def update_media_asset(self, media_asset_id, update_media_asset_details, **kwarg "mediaAssetId": media_asset_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6694,7 +6693,7 @@ def update_media_asset(self, media_asset_id, update_media_asset_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6791,7 +6790,7 @@ def update_media_workflow(self, media_workflow_id, update_media_workflow_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_media_workflow got unknown kwargs: {extra_kwargs!r}") @@ -6800,16 +6799,16 @@ def update_media_workflow(self, media_workflow_id, update_media_workflow_details "mediaWorkflowId": media_workflow_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6817,7 +6816,7 @@ def update_media_workflow(self, media_workflow_id, update_media_workflow_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6914,7 +6913,7 @@ def update_media_workflow_configuration(self, media_workflow_configuration_id, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_media_workflow_configuration got unknown kwargs: {extra_kwargs!r}") @@ -6923,16 +6922,16 @@ def update_media_workflow_configuration(self, media_workflow_configuration_id, u "mediaWorkflowConfigurationId": media_workflow_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6940,7 +6939,7 @@ def update_media_workflow_configuration(self, media_workflow_configuration_id, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7037,7 +7036,7 @@ def update_media_workflow_job(self, media_workflow_job_id, update_media_workflow "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_media_workflow_job got unknown kwargs: {extra_kwargs!r}") @@ -7046,16 +7045,16 @@ def update_media_workflow_job(self, media_workflow_job_id, update_media_workflow "mediaWorkflowJobId": media_workflow_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7063,7 +7062,7 @@ def update_media_workflow_job(self, media_workflow_job_id, update_media_workflow "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7160,7 +7159,7 @@ def update_stream_cdn_config(self, stream_cdn_config_id, update_stream_cdn_confi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stream_cdn_config got unknown kwargs: {extra_kwargs!r}") @@ -7169,16 +7168,16 @@ def update_stream_cdn_config(self, stream_cdn_config_id, update_stream_cdn_confi "streamCdnConfigId": stream_cdn_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7186,7 +7185,7 @@ def update_stream_cdn_config(self, stream_cdn_config_id, update_stream_cdn_confi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7283,7 +7282,7 @@ def update_stream_distribution_channel(self, stream_distribution_channel_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stream_distribution_channel got unknown kwargs: {extra_kwargs!r}") @@ -7292,16 +7291,16 @@ def update_stream_distribution_channel(self, stream_distribution_channel_id, upd "streamDistributionChannelId": stream_distribution_channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7309,7 +7308,7 @@ def update_stream_distribution_channel(self, stream_distribution_channel_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7406,7 +7405,7 @@ def update_stream_packaging_config(self, stream_packaging_config_id, update_stre "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stream_packaging_config got unknown kwargs: {extra_kwargs!r}") @@ -7415,16 +7414,16 @@ def update_stream_packaging_config(self, stream_packaging_config_id, update_stre "streamPackagingConfigId": stream_packaging_config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7432,7 +7431,7 @@ def update_stream_packaging_config(self, stream_packaging_config_id, update_stre "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/media_services/media_stream_client.py b/src/oci/media_services/media_stream_client.py index 75fc4f6b7f..7e7d95914c 100644 --- a/src/oci/media_services/media_stream_client.py +++ b/src/oci/media_services/media_stream_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def generate_playlist(self, stream_packaging_config_id, media_asset_id, **kwargs "opc_request_id", "token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_playlist got unknown kwargs: {extra_kwargs!r}") @@ -177,14 +176,14 @@ def generate_playlist(self, stream_packaging_config_id, media_asset_id, **kwargs "mediaAssetId": media_asset_id, "token": kwargs.get("token", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/x-mpegurl, application/dash+xml", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def generate_session_token(self, generate_session_token_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_session_token got unknown kwargs: {extra_kwargs!r}") @@ -272,7 +271,7 @@ def generate_session_token(self, generate_session_token_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/monitoring/monitoring_client.py b/src/oci/monitoring/monitoring_client.py index ac512d57bb..2b0a41a489 100644 --- a/src/oci/monitoring/monitoring_client.py +++ b/src/oci/monitoring/monitoring_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -185,7 +184,7 @@ def change_alarm_compartment(self, alarm_id, change_alarm_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_alarm_compartment got unknown kwargs: {extra_kwargs!r}") @@ -194,10 +193,10 @@ def change_alarm_compartment(self, alarm_id, change_alarm_compartment_details, * "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -207,7 +206,7 @@ def change_alarm_compartment(self, alarm_id, change_alarm_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -304,7 +303,7 @@ def create_alarm(self, create_alarm_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_alarm got unknown kwargs: {extra_kwargs!r}") @@ -315,7 +314,7 @@ def create_alarm(self, create_alarm_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -410,7 +409,7 @@ def create_alarm_suppression(self, create_alarm_suppression_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_alarm_suppression got unknown kwargs: {extra_kwargs!r}") @@ -421,7 +420,7 @@ def create_alarm_suppression(self, create_alarm_suppression_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -518,7 +517,7 @@ def delete_alarm(self, alarm_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_alarm got unknown kwargs: {extra_kwargs!r}") @@ -527,10 +526,10 @@ def delete_alarm(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -539,7 +538,7 @@ def delete_alarm(self, alarm_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -631,7 +630,7 @@ def delete_alarm_suppression(self, alarm_suppression_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_alarm_suppression got unknown kwargs: {extra_kwargs!r}") @@ -640,10 +639,10 @@ def delete_alarm_suppression(self, alarm_suppression_id, **kwargs): "alarmSuppressionId": alarm_suppression_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -652,7 +651,7 @@ def delete_alarm_suppression(self, alarm_suppression_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -740,7 +739,7 @@ def get_alarm(self, alarm_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alarm got unknown kwargs: {extra_kwargs!r}") @@ -749,10 +748,10 @@ def get_alarm(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -760,7 +759,7 @@ def get_alarm(self, alarm_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -892,7 +891,7 @@ def get_alarm_history(self, alarm_id, **kwargs): "timestamp_greater_than_or_equal_to", "timestamp_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alarm_history got unknown kwargs: {extra_kwargs!r}") @@ -901,10 +900,10 @@ def get_alarm_history(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'alarm_historytype' in kwargs: @@ -921,14 +920,14 @@ def get_alarm_history(self, alarm_id, **kwargs): "timestampGreaterThanOrEqualTo": kwargs.get("timestamp_greater_than_or_equal_to", missing), "timestampLessThan": kwargs.get("timestamp_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1018,7 +1017,7 @@ def get_alarm_suppression(self, alarm_suppression_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_alarm_suppression got unknown kwargs: {extra_kwargs!r}") @@ -1027,10 +1026,10 @@ def get_alarm_suppression(self, alarm_suppression_id, **kwargs): "alarmSuppressionId": alarm_suppression_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1038,7 +1037,7 @@ def get_alarm_suppression(self, alarm_suppression_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1175,7 +1174,7 @@ def list_alarm_suppressions(self, alarm_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alarm_suppressions got unknown kwargs: {extra_kwargs!r}") @@ -1210,14 +1209,14 @@ def list_alarm_suppressions(self, alarm_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1366,7 +1365,7 @@ def list_alarms(self, compartment_id, **kwargs): "sort_order", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alarms got unknown kwargs: {extra_kwargs!r}") @@ -1402,14 +1401,14 @@ def list_alarms(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1589,7 +1588,7 @@ def list_alarms_status(self, compartment_id, **kwargs): "entity_id", "status" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_alarms_status got unknown kwargs: {extra_kwargs!r}") @@ -1628,14 +1627,14 @@ def list_alarms_status(self, compartment_id, **kwargs): "entityId": kwargs.get("entity_id", missing), "status": kwargs.get("status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1763,7 +1762,7 @@ def list_metrics(self, compartment_id, list_metrics_details, **kwargs): "limit", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_metrics got unknown kwargs: {extra_kwargs!r}") @@ -1774,14 +1773,14 @@ def list_metrics(self, compartment_id, list_metrics_details, **kwargs): "limit": kwargs.get("limit", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1899,7 +1898,7 @@ def post_metric_data(self, post_metric_data_details, **kwargs): "opc_request_id", "content_encoding" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"post_metric_data got unknown kwargs: {extra_kwargs!r}") @@ -1910,7 +1909,7 @@ def post_metric_data(self, post_metric_data_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "content-encoding": kwargs.get("content_encoding", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2006,7 +2005,7 @@ def remove_alarm_suppression(self, alarm_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_alarm_suppression got unknown kwargs: {extra_kwargs!r}") @@ -2015,10 +2014,10 @@ def remove_alarm_suppression(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2027,7 +2026,7 @@ def remove_alarm_suppression(self, alarm_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2141,7 +2140,7 @@ def retrieve_dimension_states(self, alarm_id, **kwargs): "limit", "retrieve_dimension_states_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_dimension_states got unknown kwargs: {extra_kwargs!r}") @@ -2150,24 +2149,24 @@ def retrieve_dimension_states(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2283,7 +2282,7 @@ def summarize_alarm_suppression_history(self, alarm_id, **kwargs): "limit", "summarize_alarm_suppression_history_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_alarm_suppression_history got unknown kwargs: {extra_kwargs!r}") @@ -2292,24 +2291,24 @@ def summarize_alarm_suppression_history(self, alarm_id, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2419,7 +2418,7 @@ def summarize_metrics_data(self, compartment_id, summarize_metrics_data_details, "opc_request_id", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_metrics_data got unknown kwargs: {extra_kwargs!r}") @@ -2428,14 +2427,14 @@ def summarize_metrics_data(self, compartment_id, summarize_metrics_data_details, "compartmentId": compartment_id, "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2536,7 +2535,7 @@ def update_alarm(self, alarm_id, update_alarm_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_alarm got unknown kwargs: {extra_kwargs!r}") @@ -2545,10 +2544,10 @@ def update_alarm(self, alarm_id, update_alarm_details, **kwargs): "alarmId": alarm_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2557,7 +2556,7 @@ def update_alarm(self, alarm_id, update_alarm_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/channels_client.py b/src/oci/mysql/channels_client.py index 845af182d0..cbd714e544 100644 --- a/src/oci/mysql/channels_client.py +++ b/src/oci/mysql/channels_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def create_channel(self, create_channel_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_channel got unknown kwargs: {extra_kwargs!r}") @@ -180,7 +179,7 @@ def create_channel(self, create_channel_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def delete_channel(self, channel_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_channel got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def delete_channel(self, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def delete_channel(self, channel_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def get_channel(self, channel_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_channel got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def get_channel(self, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -403,7 +402,7 @@ def get_channel(self, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -537,7 +536,7 @@ def list_channels(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_channels got unknown kwargs: {extra_kwargs!r}") @@ -575,14 +574,14 @@ def list_channels(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -682,7 +681,7 @@ def reset_channel(self, channel_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_channel got unknown kwargs: {extra_kwargs!r}") @@ -691,10 +690,10 @@ def reset_channel(self, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -704,7 +703,7 @@ def reset_channel(self, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -804,7 +803,7 @@ def resume_channel(self, channel_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resume_channel got unknown kwargs: {extra_kwargs!r}") @@ -813,10 +812,10 @@ def resume_channel(self, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -826,7 +825,7 @@ def resume_channel(self, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -930,7 +929,7 @@ def update_channel(self, channel_id, update_channel_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_channel got unknown kwargs: {extra_kwargs!r}") @@ -939,10 +938,10 @@ def update_channel(self, channel_id, update_channel_details, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -952,7 +951,7 @@ def update_channel(self, channel_id, update_channel_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/db_backups_client.py b/src/oci/mysql/db_backups_client.py index 627fe2e386..f8d90be231 100644 --- a/src/oci/mysql/db_backups_client.py +++ b/src/oci/mysql/db_backups_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -203,7 +202,7 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -291,7 +290,7 @@ def create_backup(self, create_backup_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backup got unknown kwargs: {extra_kwargs!r}") @@ -302,7 +301,7 @@ def create_backup(self, create_backup_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -391,7 +390,7 @@ def delete_backup(self, backup_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backup got unknown kwargs: {extra_kwargs!r}") @@ -400,10 +399,10 @@ def delete_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -412,7 +411,7 @@ def delete_backup(self, backup_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -498,7 +497,7 @@ def get_backup(self, backup_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backup got unknown kwargs: {extra_kwargs!r}") @@ -507,10 +506,10 @@ def get_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -519,7 +518,7 @@ def get_backup(self, backup_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -654,7 +653,7 @@ def list_backups(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backups got unknown kwargs: {extra_kwargs!r}") @@ -699,14 +698,14 @@ def list_backups(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -797,7 +796,7 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backup got unknown kwargs: {extra_kwargs!r}") @@ -806,10 +805,10 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -818,7 +817,7 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/db_system_client.py b/src/oci/mysql/db_system_client.py index 8ab47725f4..7518365099 100644 --- a/src/oci/mysql/db_system_client.py +++ b/src/oci/mysql/db_system_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -182,7 +181,7 @@ def add_heat_wave_cluster(self, db_system_id, add_heat_wave_cluster_details, **k "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def add_heat_wave_cluster(self, db_system_id, add_heat_wave_cluster_details, **k "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -204,7 +203,7 @@ def add_heat_wave_cluster(self, db_system_id, add_heat_wave_cluster_details, **k "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def create_db_system(self, create_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_db_system got unknown kwargs: {extra_kwargs!r}") @@ -307,7 +306,7 @@ def create_db_system(self, create_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -399,7 +398,7 @@ def delete_db_system(self, db_system_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_db_system got unknown kwargs: {extra_kwargs!r}") @@ -408,10 +407,10 @@ def delete_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -420,7 +419,7 @@ def delete_db_system(self, db_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -509,7 +508,7 @@ def delete_heat_wave_cluster(self, db_system_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -518,10 +517,10 @@ def delete_heat_wave_cluster(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -530,7 +529,7 @@ def delete_heat_wave_cluster(self, db_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -619,7 +618,7 @@ def generate_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"generate_heat_wave_cluster_memory_estimate got unknown kwargs: {extra_kwargs!r}") @@ -628,10 +627,10 @@ def generate_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -640,7 +639,7 @@ def generate_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -731,7 +730,7 @@ def get_db_system(self, db_system_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system got unknown kwargs: {extra_kwargs!r}") @@ -740,10 +739,10 @@ def get_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -752,7 +751,7 @@ def get_db_system(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -842,7 +841,7 @@ def get_heat_wave_cluster(self, db_system_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -851,10 +850,10 @@ def get_heat_wave_cluster(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -863,7 +862,7 @@ def get_heat_wave_cluster(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -946,7 +945,7 @@ def get_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_heat_wave_cluster_memory_estimate got unknown kwargs: {extra_kwargs!r}") @@ -955,10 +954,10 @@ def get_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -966,7 +965,7 @@ def get_heat_wave_cluster_memory_estimate(self, db_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1113,7 +1112,7 @@ def list_db_systems(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_systems got unknown kwargs: {extra_kwargs!r}") @@ -1161,14 +1160,14 @@ def list_db_systems(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1270,7 +1269,7 @@ def restart_db_system(self, db_system_id, restart_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1279,10 +1278,10 @@ def restart_db_system(self, db_system_id, restart_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1292,7 +1291,7 @@ def restart_db_system(self, db_system_id, restart_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1392,7 +1391,7 @@ def restart_heat_wave_cluster(self, db_system_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1401,10 +1400,10 @@ def restart_heat_wave_cluster(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1414,7 +1413,7 @@ def restart_heat_wave_cluster(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1512,7 +1511,7 @@ def start_db_system(self, db_system_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1521,10 +1520,10 @@ def start_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1534,7 +1533,7 @@ def start_db_system(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1632,7 +1631,7 @@ def start_heat_wave_cluster(self, db_system_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1641,10 +1640,10 @@ def start_heat_wave_cluster(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1654,7 +1653,7 @@ def start_heat_wave_cluster(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1757,7 +1756,7 @@ def stop_db_system(self, db_system_id, stop_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1766,10 +1765,10 @@ def stop_db_system(self, db_system_id, stop_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1779,7 +1778,7 @@ def stop_db_system(self, db_system_id, stop_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1879,7 +1878,7 @@ def stop_heat_wave_cluster(self, db_system_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1888,10 +1887,10 @@ def stop_heat_wave_cluster(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1901,7 +1900,7 @@ def stop_heat_wave_cluster(self, db_system_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2000,7 +1999,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_system got unknown kwargs: {extra_kwargs!r}") @@ -2009,10 +2008,10 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2021,7 +2020,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2114,7 +2113,7 @@ def update_heat_wave_cluster(self, db_system_id, update_heat_wave_cluster_detail "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_heat_wave_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2123,10 +2122,10 @@ def update_heat_wave_cluster(self, db_system_id, update_heat_wave_cluster_detail "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2135,7 +2134,7 @@ def update_heat_wave_cluster(self, db_system_id, update_heat_wave_cluster_detail "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/mysqlaas_client.py b/src/oci/mysql/mysqlaas_client.py index 649260025e..d8b560470a 100644 --- a/src/oci/mysql/mysqlaas_client.py +++ b/src/oci/mysql/mysqlaas_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def create_configuration(self, create_configuration_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_configuration got unknown kwargs: {extra_kwargs!r}") @@ -180,7 +179,7 @@ def create_configuration(self, create_configuration_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -268,7 +267,7 @@ def delete_configuration(self, configuration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_configuration got unknown kwargs: {extra_kwargs!r}") @@ -277,10 +276,10 @@ def delete_configuration(self, configuration_id, **kwargs): "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -289,7 +288,7 @@ def delete_configuration(self, configuration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -375,7 +374,7 @@ def get_configuration(self, configuration_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration got unknown kwargs: {extra_kwargs!r}") @@ -384,10 +383,10 @@ def get_configuration(self, configuration_id, **kwargs): "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -396,7 +395,7 @@ def get_configuration(self, configuration_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -536,7 +535,7 @@ def list_configurations(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_configurations got unknown kwargs: {extra_kwargs!r}") @@ -582,14 +581,14 @@ def list_configurations(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -688,7 +687,7 @@ def list_shapes(self, compartment_id, **kwargs): "availability_domain", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shapes got unknown kwargs: {extra_kwargs!r}") @@ -707,14 +706,14 @@ def list_shapes(self, compartment_id, **kwargs): "compartmentId": compartment_id, "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -798,7 +797,7 @@ def list_versions(self, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_versions got unknown kwargs: {extra_kwargs!r}") @@ -806,14 +805,14 @@ def list_versions(self, compartment_id, **kwargs): query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -904,7 +903,7 @@ def update_configuration(self, configuration_id, update_configuration_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration got unknown kwargs: {extra_kwargs!r}") @@ -913,10 +912,10 @@ def update_configuration(self, configuration_id, update_configuration_details, * "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -925,7 +924,7 @@ def update_configuration(self, configuration_id, update_configuration_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/replicas_client.py b/src/oci/mysql/replicas_client.py index 8b89ebc2eb..ae39cfc45f 100644 --- a/src/oci/mysql/replicas_client.py +++ b/src/oci/mysql/replicas_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def create_replica(self, create_replica_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_replica got unknown kwargs: {extra_kwargs!r}") @@ -180,7 +179,7 @@ def create_replica(self, create_replica_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def delete_replica(self, replica_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replica got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def delete_replica(self, replica_id, **kwargs): "replicaId": replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def delete_replica(self, replica_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -380,7 +379,7 @@ def get_replica(self, replica_id, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replica got unknown kwargs: {extra_kwargs!r}") @@ -389,10 +388,10 @@ def get_replica(self, replica_id, **kwargs): "replicaId": replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -401,7 +400,7 @@ def get_replica(self, replica_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -541,7 +540,7 @@ def list_replicas(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replicas got unknown kwargs: {extra_kwargs!r}") @@ -580,14 +579,14 @@ def list_replicas(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -680,7 +679,7 @@ def update_replica(self, replica_id, update_replica_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_replica got unknown kwargs: {extra_kwargs!r}") @@ -689,10 +688,10 @@ def update_replica(self, replica_id, update_replica_details, **kwargs): "replicaId": replica_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -701,7 +700,7 @@ def update_replica(self, replica_id, update_replica_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/mysql/work_requests_client.py b/src/oci/mysql/work_requests_client.py index f05f80b350..908670f18f 100644 --- a/src/oci/mysql/work_requests_client.py +++ b/src/oci/mysql/work_requests_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def get_work_request(self, work_request_id, **kwargs): "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def get_work_request(self, work_request_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -293,24 +292,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -407,7 +406,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -416,24 +415,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -544,7 +543,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -570,14 +569,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/network_firewall/network_firewall_client.py b/src/oci/network_firewall/network_firewall_client.py index efe6d28812..cad67628e2 100644 --- a/src/oci/network_firewall/network_firewall_client.py +++ b/src/oci/network_firewall/network_firewall_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def apply_network_firewall_policy(self, network_firewall_policy_id, apply_networ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"apply_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def apply_network_firewall_policy(self, network_firewall_policy_id, apply_networ "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def apply_network_firewall_policy(self, network_firewall_policy_id, apply_networ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -308,7 +307,7 @@ def bulk_upload_address_lists(self, network_firewall_policy_id, bulk_upload_addr "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_address_lists got unknown kwargs: {extra_kwargs!r}") @@ -317,10 +316,10 @@ def bulk_upload_address_lists(self, network_firewall_policy_id, bulk_upload_addr "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -329,7 +328,7 @@ def bulk_upload_address_lists(self, network_firewall_policy_id, bulk_upload_addr "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -338,7 +337,7 @@ def bulk_upload_address_lists(self, network_firewall_policy_id, bulk_upload_addr bulk_upload_address_lists_details = kwargs.get("bulk_upload_address_lists_details", missing) if bulk_upload_address_lists_details is not missing and bulk_upload_address_lists_details is not None: - if (not isinstance(bulk_upload_address_lists_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_address_lists_details, (bytes, str)) and not hasattr(bulk_upload_address_lists_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -456,7 +455,7 @@ def bulk_upload_application_groups(self, network_firewall_policy_id, bulk_upload "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_application_groups got unknown kwargs: {extra_kwargs!r}") @@ -465,10 +464,10 @@ def bulk_upload_application_groups(self, network_firewall_policy_id, bulk_upload "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -477,7 +476,7 @@ def bulk_upload_application_groups(self, network_firewall_policy_id, bulk_upload "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -486,7 +485,7 @@ def bulk_upload_application_groups(self, network_firewall_policy_id, bulk_upload bulk_upload_application_groups_details = kwargs.get("bulk_upload_application_groups_details", missing) if bulk_upload_application_groups_details is not missing and bulk_upload_application_groups_details is not None: - if (not isinstance(bulk_upload_application_groups_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_application_groups_details, (bytes, str)) and not hasattr(bulk_upload_application_groups_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -604,7 +603,7 @@ def bulk_upload_applications(self, network_firewall_policy_id, bulk_upload_appli "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_applications got unknown kwargs: {extra_kwargs!r}") @@ -613,10 +612,10 @@ def bulk_upload_applications(self, network_firewall_policy_id, bulk_upload_appli "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -625,7 +624,7 @@ def bulk_upload_applications(self, network_firewall_policy_id, bulk_upload_appli "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -634,7 +633,7 @@ def bulk_upload_applications(self, network_firewall_policy_id, bulk_upload_appli bulk_upload_applications_details = kwargs.get("bulk_upload_applications_details", missing) if bulk_upload_applications_details is not missing and bulk_upload_applications_details is not None: - if (not isinstance(bulk_upload_applications_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_applications_details, (bytes, str)) and not hasattr(bulk_upload_applications_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -752,7 +751,7 @@ def bulk_upload_decryption_profiles(self, network_firewall_policy_id, bulk_uploa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_decryption_profiles got unknown kwargs: {extra_kwargs!r}") @@ -761,10 +760,10 @@ def bulk_upload_decryption_profiles(self, network_firewall_policy_id, bulk_uploa "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -773,7 +772,7 @@ def bulk_upload_decryption_profiles(self, network_firewall_policy_id, bulk_uploa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -782,7 +781,7 @@ def bulk_upload_decryption_profiles(self, network_firewall_policy_id, bulk_uploa bulk_upload_decryption_profiles_details = kwargs.get("bulk_upload_decryption_profiles_details", missing) if bulk_upload_decryption_profiles_details is not missing and bulk_upload_decryption_profiles_details is not None: - if (not isinstance(bulk_upload_decryption_profiles_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_decryption_profiles_details, (bytes, str)) and not hasattr(bulk_upload_decryption_profiles_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -900,7 +899,7 @@ def bulk_upload_decryption_rules(self, network_firewall_policy_id, bulk_upload_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_decryption_rules got unknown kwargs: {extra_kwargs!r}") @@ -909,10 +908,10 @@ def bulk_upload_decryption_rules(self, network_firewall_policy_id, bulk_upload_d "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -921,7 +920,7 @@ def bulk_upload_decryption_rules(self, network_firewall_policy_id, bulk_upload_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -930,7 +929,7 @@ def bulk_upload_decryption_rules(self, network_firewall_policy_id, bulk_upload_d bulk_upload_decryption_rules_details = kwargs.get("bulk_upload_decryption_rules_details", missing) if bulk_upload_decryption_rules_details is not missing and bulk_upload_decryption_rules_details is not None: - if (not isinstance(bulk_upload_decryption_rules_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_decryption_rules_details, (bytes, str)) and not hasattr(bulk_upload_decryption_rules_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1048,7 +1047,7 @@ def bulk_upload_mapped_secrets(self, network_firewall_policy_id, bulk_upload_map "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_mapped_secrets got unknown kwargs: {extra_kwargs!r}") @@ -1057,10 +1056,10 @@ def bulk_upload_mapped_secrets(self, network_firewall_policy_id, bulk_upload_map "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1069,7 +1068,7 @@ def bulk_upload_mapped_secrets(self, network_firewall_policy_id, bulk_upload_map "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1078,7 +1077,7 @@ def bulk_upload_mapped_secrets(self, network_firewall_policy_id, bulk_upload_map bulk_upload_mapped_secrets_details = kwargs.get("bulk_upload_mapped_secrets_details", missing) if bulk_upload_mapped_secrets_details is not missing and bulk_upload_mapped_secrets_details is not None: - if (not isinstance(bulk_upload_mapped_secrets_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_mapped_secrets_details, (bytes, str)) and not hasattr(bulk_upload_mapped_secrets_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1196,7 +1195,7 @@ def bulk_upload_security_rules(self, network_firewall_policy_id, bulk_upload_sec "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -1205,10 +1204,10 @@ def bulk_upload_security_rules(self, network_firewall_policy_id, bulk_upload_sec "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1217,7 +1216,7 @@ def bulk_upload_security_rules(self, network_firewall_policy_id, bulk_upload_sec "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1226,7 +1225,7 @@ def bulk_upload_security_rules(self, network_firewall_policy_id, bulk_upload_sec bulk_upload_security_rules_details = kwargs.get("bulk_upload_security_rules_details", missing) if bulk_upload_security_rules_details is not missing and bulk_upload_security_rules_details is not None: - if (not isinstance(bulk_upload_security_rules_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_security_rules_details, (bytes, str)) and not hasattr(bulk_upload_security_rules_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1344,7 +1343,7 @@ def bulk_upload_service_lists(self, network_firewall_policy_id, bulk_upload_serv "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_service_lists got unknown kwargs: {extra_kwargs!r}") @@ -1353,10 +1352,10 @@ def bulk_upload_service_lists(self, network_firewall_policy_id, bulk_upload_serv "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1365,7 +1364,7 @@ def bulk_upload_service_lists(self, network_firewall_policy_id, bulk_upload_serv "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1374,7 +1373,7 @@ def bulk_upload_service_lists(self, network_firewall_policy_id, bulk_upload_serv bulk_upload_service_lists_details = kwargs.get("bulk_upload_service_lists_details", missing) if bulk_upload_service_lists_details is not missing and bulk_upload_service_lists_details is not None: - if (not isinstance(bulk_upload_service_lists_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_service_lists_details, (bytes, str)) and not hasattr(bulk_upload_service_lists_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1492,7 +1491,7 @@ def bulk_upload_services(self, network_firewall_policy_id, bulk_upload_services_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_services got unknown kwargs: {extra_kwargs!r}") @@ -1501,10 +1500,10 @@ def bulk_upload_services(self, network_firewall_policy_id, bulk_upload_services_ "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1513,7 +1512,7 @@ def bulk_upload_services(self, network_firewall_policy_id, bulk_upload_services_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1522,7 +1521,7 @@ def bulk_upload_services(self, network_firewall_policy_id, bulk_upload_services_ bulk_upload_services_details = kwargs.get("bulk_upload_services_details", missing) if bulk_upload_services_details is not missing and bulk_upload_services_details is not None: - if (not isinstance(bulk_upload_services_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_services_details, (bytes, str)) and not hasattr(bulk_upload_services_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1640,7 +1639,7 @@ def bulk_upload_url_lists(self, network_firewall_policy_id, bulk_upload_url_list "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_upload_url_lists got unknown kwargs: {extra_kwargs!r}") @@ -1649,10 +1648,10 @@ def bulk_upload_url_lists(self, network_firewall_policy_id, bulk_upload_url_list "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1661,7 +1660,7 @@ def bulk_upload_url_lists(self, network_firewall_policy_id, bulk_upload_url_list "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1670,7 +1669,7 @@ def bulk_upload_url_lists(self, network_firewall_policy_id, bulk_upload_url_list bulk_upload_url_lists_details = kwargs.get("bulk_upload_url_lists_details", missing) if bulk_upload_url_lists_details is not missing and bulk_upload_url_lists_details is not None: - if (not isinstance(bulk_upload_url_lists_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_url_lists_details, (bytes, str)) and not hasattr(bulk_upload_url_lists_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1769,7 +1768,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1778,10 +1777,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1790,7 +1789,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1887,7 +1886,7 @@ def change_network_firewall_compartment(self, network_firewall_id, change_networ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_network_firewall_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1896,10 +1895,10 @@ def change_network_firewall_compartment(self, network_firewall_id, change_networ "networkFirewallId": network_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1909,7 +1908,7 @@ def change_network_firewall_compartment(self, network_firewall_id, change_networ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2007,7 +2006,7 @@ def change_network_firewall_policy_compartment(self, network_firewall_policy_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_network_firewall_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2016,10 +2015,10 @@ def change_network_firewall_policy_compartment(self, network_firewall_policy_id, "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2029,7 +2028,7 @@ def change_network_firewall_policy_compartment(self, network_firewall_policy_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2127,7 +2126,7 @@ def clone_network_firewall_policy(self, network_firewall_policy_id, clone_networ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"clone_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -2136,10 +2135,10 @@ def clone_network_firewall_policy(self, network_firewall_policy_id, clone_networ "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2149,7 +2148,7 @@ def clone_network_firewall_policy(self, network_firewall_policy_id, clone_networ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2241,7 +2240,7 @@ def create_address_list(self, network_firewall_policy_id, create_address_list_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_address_list got unknown kwargs: {extra_kwargs!r}") @@ -2250,10 +2249,10 @@ def create_address_list(self, network_firewall_policy_id, create_address_list_de "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2262,7 +2261,7 @@ def create_address_list(self, network_firewall_policy_id, create_address_list_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2354,7 +2353,7 @@ def create_application(self, network_firewall_policy_id, create_application_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application got unknown kwargs: {extra_kwargs!r}") @@ -2363,10 +2362,10 @@ def create_application(self, network_firewall_policy_id, create_application_deta "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2375,7 +2374,7 @@ def create_application(self, network_firewall_policy_id, create_application_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2467,7 +2466,7 @@ def create_application_group(self, network_firewall_policy_id, create_applicatio "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_application_group got unknown kwargs: {extra_kwargs!r}") @@ -2476,10 +2475,10 @@ def create_application_group(self, network_firewall_policy_id, create_applicatio "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2488,7 +2487,7 @@ def create_application_group(self, network_firewall_policy_id, create_applicatio "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2580,7 +2579,7 @@ def create_decryption_profile(self, network_firewall_policy_id, create_decryptio "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_decryption_profile got unknown kwargs: {extra_kwargs!r}") @@ -2589,10 +2588,10 @@ def create_decryption_profile(self, network_firewall_policy_id, create_decryptio "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2601,7 +2600,7 @@ def create_decryption_profile(self, network_firewall_policy_id, create_decryptio "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2693,7 +2692,7 @@ def create_decryption_rule(self, network_firewall_policy_id, create_decryption_r "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_decryption_rule got unknown kwargs: {extra_kwargs!r}") @@ -2702,10 +2701,10 @@ def create_decryption_rule(self, network_firewall_policy_id, create_decryption_r "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2714,7 +2713,7 @@ def create_decryption_rule(self, network_firewall_policy_id, create_decryption_r "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2806,7 +2805,7 @@ def create_mapped_secret(self, network_firewall_policy_id, create_mapped_secret_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_mapped_secret got unknown kwargs: {extra_kwargs!r}") @@ -2815,10 +2814,10 @@ def create_mapped_secret(self, network_firewall_policy_id, create_mapped_secret_ "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2827,7 +2826,7 @@ def create_mapped_secret(self, network_firewall_policy_id, create_mapped_secret_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2916,7 +2915,7 @@ def create_network_firewall(self, create_network_firewall_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_firewall got unknown kwargs: {extra_kwargs!r}") @@ -2927,7 +2926,7 @@ def create_network_firewall(self, create_network_firewall_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3014,7 +3013,7 @@ def create_network_firewall_policy(self, create_network_firewall_policy_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -3025,7 +3024,7 @@ def create_network_firewall_policy(self, create_network_firewall_policy_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3115,7 +3114,7 @@ def create_security_rule(self, network_firewall_policy_id, create_security_rule_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_security_rule got unknown kwargs: {extra_kwargs!r}") @@ -3124,10 +3123,10 @@ def create_security_rule(self, network_firewall_policy_id, create_security_rule_ "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3136,7 +3135,7 @@ def create_security_rule(self, network_firewall_policy_id, create_security_rule_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3228,7 +3227,7 @@ def create_service(self, network_firewall_policy_id, create_service_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service got unknown kwargs: {extra_kwargs!r}") @@ -3237,10 +3236,10 @@ def create_service(self, network_firewall_policy_id, create_service_details, **k "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3249,7 +3248,7 @@ def create_service(self, network_firewall_policy_id, create_service_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3341,7 +3340,7 @@ def create_service_list(self, network_firewall_policy_id, create_service_list_de "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_list got unknown kwargs: {extra_kwargs!r}") @@ -3350,10 +3349,10 @@ def create_service_list(self, network_firewall_policy_id, create_service_list_de "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3362,7 +3361,7 @@ def create_service_list(self, network_firewall_policy_id, create_service_list_de "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3454,7 +3453,7 @@ def create_url_list(self, network_firewall_policy_id, create_url_list_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_url_list got unknown kwargs: {extra_kwargs!r}") @@ -3463,10 +3462,10 @@ def create_url_list(self, network_firewall_policy_id, create_url_list_details, * "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3475,7 +3474,7 @@ def create_url_list(self, network_firewall_policy_id, create_url_list_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3567,7 +3566,7 @@ def delete_address_list(self, network_firewall_policy_id, address_list_name, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_address_list got unknown kwargs: {extra_kwargs!r}") @@ -3577,10 +3576,10 @@ def delete_address_list(self, network_firewall_policy_id, address_list_name, **k "addressListName": address_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3589,7 +3588,7 @@ def delete_address_list(self, network_firewall_policy_id, address_list_name, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3676,7 +3675,7 @@ def delete_application(self, network_firewall_policy_id, application_name, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application got unknown kwargs: {extra_kwargs!r}") @@ -3686,10 +3685,10 @@ def delete_application(self, network_firewall_policy_id, application_name, **kwa "applicationName": application_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3698,7 +3697,7 @@ def delete_application(self, network_firewall_policy_id, application_name, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3785,7 +3784,7 @@ def delete_application_group(self, network_firewall_policy_id, application_group "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_application_group got unknown kwargs: {extra_kwargs!r}") @@ -3795,10 +3794,10 @@ def delete_application_group(self, network_firewall_policy_id, application_group "applicationGroupName": application_group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3807,7 +3806,7 @@ def delete_application_group(self, network_firewall_policy_id, application_group "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3894,7 +3893,7 @@ def delete_decryption_profile(self, network_firewall_policy_id, decryption_profi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_decryption_profile got unknown kwargs: {extra_kwargs!r}") @@ -3904,10 +3903,10 @@ def delete_decryption_profile(self, network_firewall_policy_id, decryption_profi "decryptionProfileName": decryption_profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3916,7 +3915,7 @@ def delete_decryption_profile(self, network_firewall_policy_id, decryption_profi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4003,7 +4002,7 @@ def delete_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_decryption_rule got unknown kwargs: {extra_kwargs!r}") @@ -4013,10 +4012,10 @@ def delete_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "decryptionRuleName": decryption_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4025,7 +4024,7 @@ def delete_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4112,7 +4111,7 @@ def delete_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_mapped_secret got unknown kwargs: {extra_kwargs!r}") @@ -4122,10 +4121,10 @@ def delete_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, * "mappedSecretName": mapped_secret_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4134,7 +4133,7 @@ def delete_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4220,7 +4219,7 @@ def delete_network_firewall(self, network_firewall_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_firewall got unknown kwargs: {extra_kwargs!r}") @@ -4229,10 +4228,10 @@ def delete_network_firewall(self, network_firewall_id, **kwargs): "networkFirewallId": network_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4241,7 +4240,7 @@ def delete_network_firewall(self, network_firewall_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4325,7 +4324,7 @@ def delete_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -4334,10 +4333,10 @@ def delete_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4346,7 +4345,7 @@ def delete_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4433,7 +4432,7 @@ def delete_security_rule(self, network_firewall_policy_id, security_rule_name, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_security_rule got unknown kwargs: {extra_kwargs!r}") @@ -4443,10 +4442,10 @@ def delete_security_rule(self, network_firewall_policy_id, security_rule_name, * "securityRuleName": security_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4455,7 +4454,7 @@ def delete_security_rule(self, network_firewall_policy_id, security_rule_name, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4542,7 +4541,7 @@ def delete_service(self, network_firewall_policy_id, service_name, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service got unknown kwargs: {extra_kwargs!r}") @@ -4552,10 +4551,10 @@ def delete_service(self, network_firewall_policy_id, service_name, **kwargs): "serviceName": service_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4564,7 +4563,7 @@ def delete_service(self, network_firewall_policy_id, service_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4651,7 +4650,7 @@ def delete_service_list(self, network_firewall_policy_id, service_list_name, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_list got unknown kwargs: {extra_kwargs!r}") @@ -4661,10 +4660,10 @@ def delete_service_list(self, network_firewall_policy_id, service_list_name, **k "serviceListName": service_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4673,7 +4672,7 @@ def delete_service_list(self, network_firewall_policy_id, service_list_name, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4760,7 +4759,7 @@ def delete_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_url_list got unknown kwargs: {extra_kwargs!r}") @@ -4770,10 +4769,10 @@ def delete_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "urlListName": url_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4782,7 +4781,7 @@ def delete_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4861,7 +4860,7 @@ def get_address_list(self, network_firewall_policy_id, address_list_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_address_list got unknown kwargs: {extra_kwargs!r}") @@ -4871,10 +4870,10 @@ def get_address_list(self, network_firewall_policy_id, address_list_name, **kwar "addressListName": address_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4882,7 +4881,7 @@ def get_address_list(self, network_firewall_policy_id, address_list_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4971,7 +4970,7 @@ def get_application(self, network_firewall_policy_id, application_name, **kwargs "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application got unknown kwargs: {extra_kwargs!r}") @@ -4981,24 +4980,24 @@ def get_application(self, network_firewall_policy_id, application_name, **kwargs "applicationName": application_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5081,7 +5080,7 @@ def get_application_group(self, network_firewall_policy_id, application_group_na "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_application_group got unknown kwargs: {extra_kwargs!r}") @@ -5091,10 +5090,10 @@ def get_application_group(self, network_firewall_policy_id, application_group_na "applicationGroupName": application_group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5102,7 +5101,7 @@ def get_application_group(self, network_firewall_policy_id, application_group_na "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5183,7 +5182,7 @@ def get_decryption_profile(self, network_firewall_policy_id, decryption_profile_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_decryption_profile got unknown kwargs: {extra_kwargs!r}") @@ -5193,10 +5192,10 @@ def get_decryption_profile(self, network_firewall_policy_id, decryption_profile_ "decryptionProfileName": decryption_profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5204,7 +5203,7 @@ def get_decryption_profile(self, network_firewall_policy_id, decryption_profile_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5293,7 +5292,7 @@ def get_decryption_rule(self, network_firewall_policy_id, decryption_rule_name, "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_decryption_rule got unknown kwargs: {extra_kwargs!r}") @@ -5303,24 +5302,24 @@ def get_decryption_rule(self, network_firewall_policy_id, decryption_rule_name, "decryptionRuleName": decryption_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5411,7 +5410,7 @@ def get_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, **kw "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mapped_secret got unknown kwargs: {extra_kwargs!r}") @@ -5421,24 +5420,24 @@ def get_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, **kw "mappedSecretName": mapped_secret_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5520,7 +5519,7 @@ def get_network_firewall(self, network_firewall_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_firewall got unknown kwargs: {extra_kwargs!r}") @@ -5529,10 +5528,10 @@ def get_network_firewall(self, network_firewall_id, **kwargs): "networkFirewallId": network_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5540,7 +5539,7 @@ def get_network_firewall(self, network_firewall_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5618,7 +5617,7 @@ def get_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -5627,10 +5626,10 @@ def get_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5638,7 +5637,7 @@ def get_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5719,7 +5718,7 @@ def get_security_rule(self, network_firewall_policy_id, security_rule_name, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_security_rule got unknown kwargs: {extra_kwargs!r}") @@ -5729,10 +5728,10 @@ def get_security_rule(self, network_firewall_policy_id, security_rule_name, **kw "securityRuleName": security_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5740,7 +5739,7 @@ def get_security_rule(self, network_firewall_policy_id, security_rule_name, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5829,7 +5828,7 @@ def get_service(self, network_firewall_policy_id, service_name, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service got unknown kwargs: {extra_kwargs!r}") @@ -5839,24 +5838,24 @@ def get_service(self, network_firewall_policy_id, service_name, **kwargs): "serviceName": service_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5939,7 +5938,7 @@ def get_service_list(self, network_firewall_policy_id, service_list_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_list got unknown kwargs: {extra_kwargs!r}") @@ -5949,10 +5948,10 @@ def get_service_list(self, network_firewall_policy_id, service_list_name, **kwar "serviceListName": service_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5960,7 +5959,7 @@ def get_service_list(self, network_firewall_policy_id, service_list_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6041,7 +6040,7 @@ def get_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_url_list got unknown kwargs: {extra_kwargs!r}") @@ -6051,10 +6050,10 @@ def get_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "urlListName": url_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6062,7 +6061,7 @@ def get_url_list(self, network_firewall_policy_id, url_list_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6140,7 +6139,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -6149,10 +6148,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6160,7 +6159,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6262,7 +6261,7 @@ def list_address_lists(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_address_lists got unknown kwargs: {extra_kwargs!r}") @@ -6271,10 +6270,10 @@ def list_address_lists(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6298,14 +6297,14 @@ def list_address_lists(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6409,7 +6408,7 @@ def list_application_groups(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_application_groups got unknown kwargs: {extra_kwargs!r}") @@ -6418,10 +6417,10 @@ def list_application_groups(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6445,14 +6444,14 @@ def list_application_groups(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6556,7 +6555,7 @@ def list_applications(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_applications got unknown kwargs: {extra_kwargs!r}") @@ -6565,10 +6564,10 @@ def list_applications(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6592,14 +6591,14 @@ def list_applications(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6703,7 +6702,7 @@ def list_decryption_profiles(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_decryption_profiles got unknown kwargs: {extra_kwargs!r}") @@ -6712,10 +6711,10 @@ def list_decryption_profiles(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6739,14 +6738,14 @@ def list_decryption_profiles(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6854,7 +6853,7 @@ def list_decryption_rules(self, network_firewall_policy_id, **kwargs): "display_name", "decryption_rule_priority_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_decryption_rules got unknown kwargs: {extra_kwargs!r}") @@ -6863,10 +6862,10 @@ def list_decryption_rules(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6891,14 +6890,14 @@ def list_decryption_rules(self, network_firewall_policy_id, **kwargs): "displayName": kwargs.get("display_name", missing), "decryptionRulePriorityOrder": kwargs.get("decryption_rule_priority_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7002,7 +7001,7 @@ def list_mapped_secrets(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_mapped_secrets got unknown kwargs: {extra_kwargs!r}") @@ -7011,10 +7010,10 @@ def list_mapped_secrets(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7038,14 +7037,14 @@ def list_mapped_secrets(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7159,7 +7158,7 @@ def list_network_firewall_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_firewall_policies got unknown kwargs: {extra_kwargs!r}") @@ -7195,14 +7194,14 @@ def list_network_firewall_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7326,7 +7325,7 @@ def list_network_firewalls(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_firewalls got unknown kwargs: {extra_kwargs!r}") @@ -7364,14 +7363,14 @@ def list_network_firewalls(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7477,7 +7476,7 @@ def list_security_rules(self, network_firewall_policy_id, **kwargs): "display_name", "security_rule_priority_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_security_rules got unknown kwargs: {extra_kwargs!r}") @@ -7486,10 +7485,10 @@ def list_security_rules(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7514,14 +7513,14 @@ def list_security_rules(self, network_firewall_policy_id, **kwargs): "displayName": kwargs.get("display_name", missing), "securityRulePriorityOrder": kwargs.get("security_rule_priority_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7625,7 +7624,7 @@ def list_service_lists(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_lists got unknown kwargs: {extra_kwargs!r}") @@ -7634,10 +7633,10 @@ def list_service_lists(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7661,14 +7660,14 @@ def list_service_lists(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7772,7 +7771,7 @@ def list_services(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_services got unknown kwargs: {extra_kwargs!r}") @@ -7781,10 +7780,10 @@ def list_services(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7808,14 +7807,14 @@ def list_services(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7919,7 +7918,7 @@ def list_url_lists(self, network_firewall_policy_id, **kwargs): "opc_request_id", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_url_lists got unknown kwargs: {extra_kwargs!r}") @@ -7928,10 +7927,10 @@ def list_url_lists(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7955,14 +7954,14 @@ def list_url_lists(self, network_firewall_policy_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8062,7 +8061,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -8071,10 +8070,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -8097,14 +8096,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8204,7 +8203,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -8213,10 +8212,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -8239,14 +8238,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8360,7 +8359,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -8396,14 +8395,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8497,7 +8496,7 @@ def migrate_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"migrate_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -8506,10 +8505,10 @@ def migrate_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8519,7 +8518,7 @@ def migrate_network_firewall_policy(self, network_firewall_policy_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8610,7 +8609,7 @@ def update_address_list(self, network_firewall_policy_id, address_list_name, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_address_list got unknown kwargs: {extra_kwargs!r}") @@ -8620,10 +8619,10 @@ def update_address_list(self, network_firewall_policy_id, address_list_name, upd "addressListName": address_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8632,7 +8631,7 @@ def update_address_list(self, network_firewall_policy_id, address_list_name, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8726,7 +8725,7 @@ def update_application(self, network_firewall_policy_id, application_name, updat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application got unknown kwargs: {extra_kwargs!r}") @@ -8736,10 +8735,10 @@ def update_application(self, network_firewall_policy_id, application_name, updat "applicationName": application_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8748,7 +8747,7 @@ def update_application(self, network_firewall_policy_id, application_name, updat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8842,7 +8841,7 @@ def update_application_group(self, network_firewall_policy_id, application_group "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_application_group got unknown kwargs: {extra_kwargs!r}") @@ -8852,10 +8851,10 @@ def update_application_group(self, network_firewall_policy_id, application_group "applicationGroupName": application_group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8864,7 +8863,7 @@ def update_application_group(self, network_firewall_policy_id, application_group "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8958,7 +8957,7 @@ def update_decryption_profile(self, network_firewall_policy_id, decryption_profi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_decryption_profile got unknown kwargs: {extra_kwargs!r}") @@ -8968,10 +8967,10 @@ def update_decryption_profile(self, network_firewall_policy_id, decryption_profi "decryptionProfileName": decryption_profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8980,7 +8979,7 @@ def update_decryption_profile(self, network_firewall_policy_id, decryption_profi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9074,7 +9073,7 @@ def update_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_decryption_rule got unknown kwargs: {extra_kwargs!r}") @@ -9084,10 +9083,10 @@ def update_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "decryptionRuleName": decryption_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9096,7 +9095,7 @@ def update_decryption_rule(self, network_firewall_policy_id, decryption_rule_nam "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9190,7 +9189,7 @@ def update_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_mapped_secret got unknown kwargs: {extra_kwargs!r}") @@ -9200,10 +9199,10 @@ def update_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, u "mappedSecretName": mapped_secret_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9212,7 +9211,7 @@ def update_mapped_secret(self, network_firewall_policy_id, mapped_secret_name, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9305,7 +9304,7 @@ def update_network_firewall(self, network_firewall_id, update_network_firewall_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_firewall got unknown kwargs: {extra_kwargs!r}") @@ -9314,10 +9313,10 @@ def update_network_firewall(self, network_firewall_id, update_network_firewall_d "networkFirewallId": network_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9326,7 +9325,7 @@ def update_network_firewall(self, network_firewall_id, update_network_firewall_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9415,7 +9414,7 @@ def update_network_firewall_policy(self, network_firewall_policy_id, update_netw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -9424,10 +9423,10 @@ def update_network_firewall_policy(self, network_firewall_policy_id, update_netw "networkFirewallPolicyId": network_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9436,7 +9435,7 @@ def update_network_firewall_policy(self, network_firewall_policy_id, update_netw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9528,7 +9527,7 @@ def update_security_rule(self, network_firewall_policy_id, security_rule_name, u "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_security_rule got unknown kwargs: {extra_kwargs!r}") @@ -9538,10 +9537,10 @@ def update_security_rule(self, network_firewall_policy_id, security_rule_name, u "securityRuleName": security_rule_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9550,7 +9549,7 @@ def update_security_rule(self, network_firewall_policy_id, security_rule_name, u "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9644,7 +9643,7 @@ def update_service(self, network_firewall_policy_id, service_name, update_servic "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_service got unknown kwargs: {extra_kwargs!r}") @@ -9654,10 +9653,10 @@ def update_service(self, network_firewall_policy_id, service_name, update_servic "serviceName": service_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9666,7 +9665,7 @@ def update_service(self, network_firewall_policy_id, service_name, update_servic "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9760,7 +9759,7 @@ def update_service_list(self, network_firewall_policy_id, service_list_name, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_service_list got unknown kwargs: {extra_kwargs!r}") @@ -9770,10 +9769,10 @@ def update_service_list(self, network_firewall_policy_id, service_list_name, upd "serviceListName": service_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9782,7 +9781,7 @@ def update_service_list(self, network_firewall_policy_id, service_list_name, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9876,7 +9875,7 @@ def update_url_list(self, network_firewall_policy_id, url_list_name, update_url_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_url_list got unknown kwargs: {extra_kwargs!r}") @@ -9886,10 +9885,10 @@ def update_url_list(self, network_firewall_policy_id, url_list_name, update_url_ "urlListName": url_list_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9898,7 +9897,7 @@ def update_url_list(self, network_firewall_policy_id, url_list_name, update_url_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/network_load_balancer/network_load_balancer_client.py b/src/oci/network_load_balancer/network_load_balancer_client.py index 144bcdf182..a57591da86 100644 --- a/src/oci/network_load_balancer/network_load_balancer_client.py +++ b/src/oci/network_load_balancer/network_load_balancer_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -183,7 +182,7 @@ def change_network_load_balancer_compartment(self, network_load_balancer_id, cha "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_network_load_balancer_compartment got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def change_network_load_balancer_compartment(self, network_load_balancer_id, cha "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -205,7 +204,7 @@ def change_network_load_balancer_compartment(self, network_load_balancer_id, cha "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -311,7 +310,7 @@ def create_backend(self, network_load_balancer_id, create_backend_details, backe "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backend got unknown kwargs: {extra_kwargs!r}") @@ -321,10 +320,10 @@ def create_backend(self, network_load_balancer_id, create_backend_details, backe "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -334,7 +333,7 @@ def create_backend(self, network_load_balancer_id, create_backend_details, backe "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -435,7 +434,7 @@ def create_backend_set(self, network_load_balancer_id, create_backend_set_detail "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -444,10 +443,10 @@ def create_backend_set(self, network_load_balancer_id, create_backend_set_detail "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -457,7 +456,7 @@ def create_backend_set(self, network_load_balancer_id, create_backend_set_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -558,7 +557,7 @@ def create_listener(self, network_load_balancer_id, create_listener_details, **k "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_listener got unknown kwargs: {extra_kwargs!r}") @@ -567,10 +566,10 @@ def create_listener(self, network_load_balancer_id, create_listener_details, **k "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -580,7 +579,7 @@ def create_listener(self, network_load_balancer_id, create_listener_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -668,7 +667,7 @@ def create_network_load_balancer(self, create_network_load_balancer_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -679,7 +678,7 @@ def create_network_load_balancer(self, create_network_load_balancer_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -782,7 +781,7 @@ def delete_backend(self, network_load_balancer_id, backend_set_name, backend_nam "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backend got unknown kwargs: {extra_kwargs!r}") @@ -793,10 +792,10 @@ def delete_backend(self, network_load_balancer_id, backend_set_name, backend_nam "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -805,7 +804,7 @@ def delete_backend(self, network_load_balancer_id, backend_set_name, backend_nam "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -899,7 +898,7 @@ def delete_backend_set(self, network_load_balancer_id, backend_set_name, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -909,10 +908,10 @@ def delete_backend_set(self, network_load_balancer_id, backend_set_name, **kwarg "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -921,7 +920,7 @@ def delete_backend_set(self, network_load_balancer_id, backend_set_name, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1013,7 +1012,7 @@ def delete_listener(self, network_load_balancer_id, listener_name, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_listener got unknown kwargs: {extra_kwargs!r}") @@ -1023,10 +1022,10 @@ def delete_listener(self, network_load_balancer_id, listener_name, **kwargs): "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1035,7 +1034,7 @@ def delete_listener(self, network_load_balancer_id, listener_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1122,7 +1121,7 @@ def delete_network_load_balancer(self, network_load_balancer_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -1131,10 +1130,10 @@ def delete_network_load_balancer(self, network_load_balancer_id, **kwargs): "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1143,7 +1142,7 @@ def delete_network_load_balancer(self, network_load_balancer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1243,7 +1242,7 @@ def get_backend(self, network_load_balancer_id, backend_set_name, backend_name, "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend got unknown kwargs: {extra_kwargs!r}") @@ -1254,10 +1253,10 @@ def get_backend(self, network_load_balancer_id, backend_set_name, backend_name, "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1266,7 +1265,7 @@ def get_backend(self, network_load_balancer_id, backend_set_name, backend_name, "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1360,7 +1359,7 @@ def get_backend_health(self, network_load_balancer_id, backend_set_name, backend "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_health got unknown kwargs: {extra_kwargs!r}") @@ -1371,10 +1370,10 @@ def get_backend_health(self, network_load_balancer_id, backend_set_name, backend "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1382,7 +1381,7 @@ def get_backend_health(self, network_load_balancer_id, backend_set_name, backend "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1476,7 +1475,7 @@ def get_backend_set(self, network_load_balancer_id, backend_set_name, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -1486,10 +1485,10 @@ def get_backend_set(self, network_load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1498,7 +1497,7 @@ def get_backend_set(self, network_load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1584,7 +1583,7 @@ def get_backend_set_health(self, network_load_balancer_id, backend_set_name, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backend_set_health got unknown kwargs: {extra_kwargs!r}") @@ -1594,10 +1593,10 @@ def get_backend_set_health(self, network_load_balancer_id, backend_set_name, **k "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1605,7 +1604,7 @@ def get_backend_set_health(self, network_load_balancer_id, backend_set_name, **k "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1707,7 +1706,7 @@ def get_health_checker(self, network_load_balancer_id, backend_set_name, **kwarg "opc_retry_token", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_health_checker got unknown kwargs: {extra_kwargs!r}") @@ -1717,10 +1716,10 @@ def get_health_checker(self, network_load_balancer_id, backend_set_name, **kwarg "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1730,7 +1729,7 @@ def get_health_checker(self, network_load_balancer_id, backend_set_name, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1825,7 +1824,7 @@ def get_listener(self, network_load_balancer_id, listener_name, **kwargs): "opc_request_id", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_listener got unknown kwargs: {extra_kwargs!r}") @@ -1835,10 +1834,10 @@ def get_listener(self, network_load_balancer_id, listener_name, **kwargs): "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1847,7 +1846,7 @@ def get_listener(self, network_load_balancer_id, listener_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1936,7 +1935,7 @@ def get_network_load_balancer(self, network_load_balancer_id, **kwargs): "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -1945,10 +1944,10 @@ def get_network_load_balancer(self, network_load_balancer_id, **kwargs): "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1957,7 +1956,7 @@ def get_network_load_balancer(self, network_load_balancer_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2038,7 +2037,7 @@ def get_network_load_balancer_health(self, network_load_balancer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_load_balancer_health got unknown kwargs: {extra_kwargs!r}") @@ -2047,10 +2046,10 @@ def get_network_load_balancer_health(self, network_load_balancer_id, **kwargs): "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2058,7 +2057,7 @@ def get_network_load_balancer_health(self, network_load_balancer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2137,7 +2136,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2146,10 +2145,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2157,7 +2156,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2274,7 +2273,7 @@ def list_backend_sets(self, network_load_balancer_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backend_sets got unknown kwargs: {extra_kwargs!r}") @@ -2283,10 +2282,10 @@ def list_backend_sets(self, network_load_balancer_id, **kwargs): "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2309,7 +2308,7 @@ def list_backend_sets(self, network_load_balancer_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2317,7 +2316,7 @@ def list_backend_sets(self, network_load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2441,7 +2440,7 @@ def list_backends(self, network_load_balancer_id, backend_set_name, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backends got unknown kwargs: {extra_kwargs!r}") @@ -2451,10 +2450,10 @@ def list_backends(self, network_load_balancer_id, backend_set_name, **kwargs): "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2477,7 +2476,7 @@ def list_backends(self, network_load_balancer_id, backend_set_name, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2485,7 +2484,7 @@ def list_backends(self, network_load_balancer_id, backend_set_name, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2604,7 +2603,7 @@ def list_listeners(self, network_load_balancer_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_listeners got unknown kwargs: {extra_kwargs!r}") @@ -2613,10 +2612,10 @@ def list_listeners(self, network_load_balancer_id, **kwargs): "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2639,7 +2638,7 @@ def list_listeners(self, network_load_balancer_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2647,7 +2646,7 @@ def list_listeners(self, network_load_balancer_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2758,7 +2757,7 @@ def list_network_load_balancer_healths(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_load_balancer_healths got unknown kwargs: {extra_kwargs!r}") @@ -2784,14 +2783,14 @@ def list_network_load_balancer_healths(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2910,7 +2909,7 @@ def list_network_load_balancers(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_load_balancers got unknown kwargs: {extra_kwargs!r}") @@ -2945,14 +2944,14 @@ def list_network_load_balancers(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3056,7 +3055,7 @@ def list_network_load_balancers_policies(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_load_balancers_policies got unknown kwargs: {extra_kwargs!r}") @@ -3081,14 +3080,14 @@ def list_network_load_balancers_policies(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3193,7 +3192,7 @@ def list_network_load_balancers_protocols(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_load_balancers_protocols got unknown kwargs: {extra_kwargs!r}") @@ -3218,14 +3217,14 @@ def list_network_load_balancers_protocols(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3324,7 +3323,7 @@ def list_work_request_errors(self, work_request_id, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -3333,10 +3332,10 @@ def list_work_request_errors(self, work_request_id, compartment_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3344,14 +3343,14 @@ def list_work_request_errors(self, work_request_id, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3452,7 +3451,7 @@ def list_work_request_logs(self, work_request_id, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -3461,10 +3460,10 @@ def list_work_request_logs(self, work_request_id, compartment_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3472,14 +3471,14 @@ def list_work_request_logs(self, work_request_id, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3577,7 +3576,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3587,14 +3586,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3707,7 +3706,7 @@ def update_backend(self, network_load_balancer_id, update_backend_details, backe "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backend got unknown kwargs: {extra_kwargs!r}") @@ -3718,10 +3717,10 @@ def update_backend(self, network_load_balancer_id, update_backend_details, backe "backendName": backend_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3731,7 +3730,7 @@ def update_backend(self, network_load_balancer_id, update_backend_details, backe "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3837,7 +3836,7 @@ def update_backend_set(self, network_load_balancer_id, update_backend_set_detail "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backend_set got unknown kwargs: {extra_kwargs!r}") @@ -3847,10 +3846,10 @@ def update_backend_set(self, network_load_balancer_id, update_backend_set_detail "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3860,7 +3859,7 @@ def update_backend_set(self, network_load_balancer_id, update_backend_set_detail "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3966,7 +3965,7 @@ def update_health_checker(self, network_load_balancer_id, update_health_checker_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_health_checker got unknown kwargs: {extra_kwargs!r}") @@ -3976,10 +3975,10 @@ def update_health_checker(self, network_load_balancer_id, update_health_checker_ "backendSetName": backend_set_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3989,7 +3988,7 @@ def update_health_checker(self, network_load_balancer_id, update_health_checker_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4095,7 +4094,7 @@ def update_listener(self, network_load_balancer_id, update_listener_details, lis "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_listener got unknown kwargs: {extra_kwargs!r}") @@ -4105,10 +4104,10 @@ def update_listener(self, network_load_balancer_id, update_listener_details, lis "listenerName": listener_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4118,7 +4117,7 @@ def update_listener(self, network_load_balancer_id, update_listener_details, lis "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4211,7 +4210,7 @@ def update_network_load_balancer(self, network_load_balancer_id, update_network_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_load_balancer got unknown kwargs: {extra_kwargs!r}") @@ -4220,10 +4219,10 @@ def update_network_load_balancer(self, network_load_balancer_id, update_network_ "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4232,7 +4231,7 @@ def update_network_load_balancer(self, network_load_balancer_id, update_network_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4332,7 +4331,7 @@ def update_network_security_groups(self, network_load_balancer_id, update_networ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_security_groups got unknown kwargs: {extra_kwargs!r}") @@ -4341,10 +4340,10 @@ def update_network_security_groups(self, network_load_balancer_id, update_networ "networkLoadBalancerId": network_load_balancer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4354,7 +4353,7 @@ def update_network_security_groups(self, network_load_balancer_id, update_networ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/nosql/nosql_client.py b/src/oci/nosql/nosql_client.py index b0d997893f..60f62da38b 100644 --- a/src/oci/nosql/nosql_client.py +++ b/src/oci/nosql/nosql_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -182,7 +181,7 @@ def change_table_compartment(self, table_name_or_id, change_table_compartment_de "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_table_compartment got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def change_table_compartment(self, table_name_or_id, change_table_compartment_de "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -204,7 +203,7 @@ def change_table_compartment(self, table_name_or_id, change_table_compartment_de "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def create_index(self, table_name_or_id, create_index_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_index got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def create_index(self, table_name_or_id, create_index_details, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -317,7 +316,7 @@ def create_index(self, table_name_or_id, create_index_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -417,7 +416,7 @@ def create_replica(self, table_name_or_id, create_replica_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_replica got unknown kwargs: {extra_kwargs!r}") @@ -426,10 +425,10 @@ def create_replica(self, table_name_or_id, create_replica_details, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -439,7 +438,7 @@ def create_replica(self, table_name_or_id, create_replica_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -528,7 +527,7 @@ def create_table(self, create_table_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_table got unknown kwargs: {extra_kwargs!r}") @@ -539,7 +538,7 @@ def create_table(self, create_table_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -637,7 +636,7 @@ def delete_index(self, table_name_or_id, index_name, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_index got unknown kwargs: {extra_kwargs!r}") @@ -647,17 +646,17 @@ def delete_index(self, table_name_or_id, index_name, **kwargs): "indexName": index_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing), "isIfExists": kwargs.get("is_if_exists", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -665,7 +664,7 @@ def delete_index(self, table_name_or_id, index_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -758,7 +757,7 @@ def delete_replica(self, table_name_or_id, region, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replica got unknown kwargs: {extra_kwargs!r}") @@ -768,16 +767,16 @@ def delete_replica(self, table_name_or_id, region, **kwargs): "region": region } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -785,7 +784,7 @@ def delete_replica(self, table_name_or_id, region, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -888,7 +887,7 @@ def delete_row(self, table_name_or_id, key, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_row got unknown kwargs: {extra_kwargs!r}") @@ -897,10 +896,10 @@ def delete_row(self, table_name_or_id, key, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -909,7 +908,7 @@ def delete_row(self, table_name_or_id, key, **kwargs): "isGetReturnRow": kwargs.get("is_get_return_row", missing), "timeoutInMs": kwargs.get("timeout_in_ms", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -917,7 +916,7 @@ def delete_row(self, table_name_or_id, key, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1013,7 +1012,7 @@ def delete_table(self, table_name_or_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_table got unknown kwargs: {extra_kwargs!r}") @@ -1022,17 +1021,17 @@ def delete_table(self, table_name_or_id, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing), "isIfExists": kwargs.get("is_if_exists", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1040,7 +1039,7 @@ def delete_table(self, table_name_or_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1124,7 +1123,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1133,10 +1132,10 @@ def delete_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1145,7 +1144,7 @@ def delete_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1228,7 +1227,7 @@ def get_index(self, table_name_or_id, index_name, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_index got unknown kwargs: {extra_kwargs!r}") @@ -1238,23 +1237,23 @@ def get_index(self, table_name_or_id, index_name, **kwargs): "indexName": index_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1354,7 +1353,7 @@ def get_row(self, table_name_or_id, key, **kwargs): "timeout_in_ms", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_row got unknown kwargs: {extra_kwargs!r}") @@ -1363,10 +1362,10 @@ def get_row(self, table_name_or_id, key, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'consistency' in kwargs: @@ -1382,14 +1381,14 @@ def get_row(self, table_name_or_id, key, **kwargs): "consistency": kwargs.get("consistency", missing), "timeoutInMs": kwargs.get("timeout_in_ms", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1475,7 +1474,7 @@ def get_table(self, table_name_or_id, **kwargs): "compartment_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_table got unknown kwargs: {extra_kwargs!r}") @@ -1484,23 +1483,23 @@ def get_table(self, table_name_or_id, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1580,7 +1579,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1589,10 +1588,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1600,7 +1599,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1719,7 +1718,7 @@ def list_indexes(self, table_name_or_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_indexes got unknown kwargs: {extra_kwargs!r}") @@ -1728,10 +1727,10 @@ def list_indexes(self, table_name_or_id, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -1764,14 +1763,14 @@ def list_indexes(self, table_name_or_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1877,7 +1876,7 @@ def list_table_usage(self, table_name_or_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_table_usage got unknown kwargs: {extra_kwargs!r}") @@ -1886,10 +1885,10 @@ def list_table_usage(self, table_name_or_id, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -1899,14 +1898,14 @@ def list_table_usage(self, table_name_or_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2021,7 +2020,7 @@ def list_tables(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_tables got unknown kwargs: {extra_kwargs!r}") @@ -2056,14 +2055,14 @@ def list_tables(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2151,7 +2150,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2160,24 +2159,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2267,7 +2266,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2276,24 +2275,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2383,7 +2382,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2393,14 +2392,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2485,7 +2484,7 @@ def prepare_statement(self, compartment_id, statement, **kwargs): "is_get_query_plan", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"prepare_statement got unknown kwargs: {extra_kwargs!r}") @@ -2495,14 +2494,14 @@ def prepare_statement(self, compartment_id, statement, **kwargs): "statement": statement, "isGetQueryPlan": kwargs.get("is_get_query_plan", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2590,7 +2589,7 @@ def query(self, query_details, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"query got unknown kwargs: {extra_kwargs!r}") @@ -2599,14 +2598,14 @@ def query(self, query_details, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2687,7 +2686,7 @@ def summarize_statement(self, compartment_id, statement, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_statement got unknown kwargs: {extra_kwargs!r}") @@ -2696,14 +2695,14 @@ def summarize_statement(self, compartment_id, statement, **kwargs): "compartmentId": compartment_id, "statement": statement } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2792,7 +2791,7 @@ def update_row(self, table_name_or_id, update_row_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_row got unknown kwargs: {extra_kwargs!r}") @@ -2801,10 +2800,10 @@ def update_row(self, table_name_or_id, update_row_details, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2813,7 +2812,7 @@ def update_row(self, table_name_or_id, update_row_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2903,7 +2902,7 @@ def update_table(self, table_name_or_id, update_table_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_table got unknown kwargs: {extra_kwargs!r}") @@ -2912,10 +2911,10 @@ def update_table(self, table_name_or_id, update_table_details, **kwargs): "tableNameOrId": table_name_or_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2924,7 +2923,7 @@ def update_table(self, table_name_or_id, update_table_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/object_storage/object_storage_client.py b/src/oci/object_storage/object_storage_client.py index f5472225cb..75a7c9268a 100644 --- a/src/oci/object_storage/object_storage_client.py +++ b/src/oci/object_storage/object_storage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def abort_multipart_upload(self, namespace_name, bucket_name, object_name, uploa "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"abort_multipart_upload got unknown kwargs: {extra_kwargs!r}") @@ -184,23 +183,23 @@ def abort_multipart_upload(self, namespace_name, bucket_name, object_name, uploa "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "uploadId": upload_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -287,10 +286,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -298,7 +297,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -399,7 +398,7 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo "if_none_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"commit_multipart_upload got unknown kwargs: {extra_kwargs!r}") @@ -410,16 +409,16 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "uploadId": upload_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -428,7 +427,7 @@ def commit_multipart_upload(self, namespace_name, bucket_name, object_name, uplo "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -575,7 +574,7 @@ def copy_object(self, namespace_name, bucket_name, copy_object_details, **kwargs "opc_source_sse_customer_key_sha256", "opc_sse_kms_key_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"copy_object got unknown kwargs: {extra_kwargs!r}") @@ -585,10 +584,10 @@ def copy_object(self, namespace_name, bucket_name, copy_object_details, **kwargs "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -603,7 +602,7 @@ def copy_object(self, namespace_name, bucket_name, copy_object_details, **kwargs "opc-source-sse-customer-key-sha256": kwargs.get("opc_source_sse_customer_key_sha256", missing), "opc-sse-kms-key-id": kwargs.get("opc_sse_kms_key_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -685,7 +684,7 @@ def create_bucket(self, namespace_name, create_bucket_details, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_bucket got unknown kwargs: {extra_kwargs!r}") @@ -694,10 +693,10 @@ def create_bucket(self, namespace_name, create_bucket_details, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -705,7 +704,7 @@ def create_bucket(self, namespace_name, create_bucket_details, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -838,7 +837,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "opc_sse_customer_key_sha256", "opc_sse_kms_key_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_multipart_upload got unknown kwargs: {extra_kwargs!r}") @@ -848,10 +847,10 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -865,7 +864,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "opc-sse-customer-key-sha256": kwargs.get("opc_sse_customer_key_sha256", missing), "opc-sse-kms-key-id": kwargs.get("opc_sse_kms_key_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -952,7 +951,7 @@ def create_preauthenticated_request(self, namespace_name, bucket_name, create_pr "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_preauthenticated_request got unknown kwargs: {extra_kwargs!r}") @@ -962,10 +961,10 @@ def create_preauthenticated_request(self, namespace_name, bucket_name, create_pr "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -973,7 +972,7 @@ def create_preauthenticated_request(self, namespace_name, bucket_name, create_pr "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1060,7 +1059,7 @@ def create_replication_policy(self, namespace_name, bucket_name, create_replicat "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_replication_policy got unknown kwargs: {extra_kwargs!r}") @@ -1070,10 +1069,10 @@ def create_replication_policy(self, namespace_name, bucket_name, create_replicat "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1081,7 +1080,7 @@ def create_replication_policy(self, namespace_name, bucket_name, create_replicat "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1169,7 +1168,7 @@ def create_retention_rule(self, namespace_name, bucket_name, create_retention_ru "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_retention_rule got unknown kwargs: {extra_kwargs!r}") @@ -1179,10 +1178,10 @@ def create_retention_rule(self, namespace_name, bucket_name, create_retention_ru "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1190,7 +1189,7 @@ def create_retention_rule(self, namespace_name, bucket_name, create_retention_ru "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1283,7 +1282,7 @@ def delete_bucket(self, namespace_name, bucket_name, **kwargs): "if_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_bucket got unknown kwargs: {extra_kwargs!r}") @@ -1293,10 +1292,10 @@ def delete_bucket(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1305,7 +1304,7 @@ def delete_bucket(self, namespace_name, bucket_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1399,7 +1398,7 @@ def delete_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc_client_request_id", "version_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_object got unknown kwargs: {extra_kwargs!r}") @@ -1410,16 +1409,16 @@ def delete_object(self, namespace_name, bucket_name, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "versionId": kwargs.get("version_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1427,7 +1426,7 @@ def delete_object(self, namespace_name, bucket_name, object_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1515,7 +1514,7 @@ def delete_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "opc_client_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_object_lifecycle_policy got unknown kwargs: {extra_kwargs!r}") @@ -1525,10 +1524,10 @@ def delete_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1537,7 +1536,7 @@ def delete_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "opc-client-request-id": kwargs.get("opc_client_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1621,7 +1620,7 @@ def delete_preauthenticated_request(self, namespace_name, bucket_name, par_id, * "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_preauthenticated_request got unknown kwargs: {extra_kwargs!r}") @@ -1632,10 +1631,10 @@ def delete_preauthenticated_request(self, namespace_name, bucket_name, par_id, * "parId": par_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1643,7 +1642,7 @@ def delete_preauthenticated_request(self, namespace_name, bucket_name, par_id, * "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1726,7 +1725,7 @@ def delete_replication_policy(self, namespace_name, bucket_name, replication_id, "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_replication_policy got unknown kwargs: {extra_kwargs!r}") @@ -1737,10 +1736,10 @@ def delete_replication_policy(self, namespace_name, bucket_name, replication_id, "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1748,7 +1747,7 @@ def delete_replication_policy(self, namespace_name, bucket_name, replication_id, "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1837,7 +1836,7 @@ def delete_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "if_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_retention_rule got unknown kwargs: {extra_kwargs!r}") @@ -1848,10 +1847,10 @@ def delete_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "retentionRuleId": retention_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1860,7 +1859,7 @@ def delete_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1961,7 +1960,7 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): "opc_client_request_id", "fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_bucket got unknown kwargs: {extra_kwargs!r}") @@ -1971,10 +1970,10 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -1988,7 +1987,7 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'csv') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1997,7 +1996,7 @@ def get_bucket(self, namespace_name, bucket_name, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2088,7 +2087,7 @@ def get_namespace(self, **kwargs): "opc_client_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_namespace got unknown kwargs: {extra_kwargs!r}") @@ -2096,14 +2095,14 @@ def get_namespace(self, **kwargs): query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2189,7 +2188,7 @@ def get_namespace_metadata(self, namespace_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_namespace_metadata got unknown kwargs: {extra_kwargs!r}") @@ -2198,10 +2197,10 @@ def get_namespace_metadata(self, namespace_name, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2209,7 +2208,7 @@ def get_namespace_metadata(self, namespace_name, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2365,7 +2364,7 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "http_response_content_encoding", "http_response_expires" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_object got unknown kwargs: {extra_kwargs!r}") @@ -2376,10 +2375,10 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -2391,7 +2390,7 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "httpResponseContentEncoding": kwargs.get("http_response_content_encoding", missing), "httpResponseExpires": kwargs.get("http_response_expires", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2404,7 +2403,7 @@ def get_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc-sse-customer-key": kwargs.get("opc_sse_customer_key", missing), "opc-sse-customer-key-sha256": kwargs.get("opc_sse_customer_key_sha256", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2488,7 +2487,7 @@ def get_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_object_lifecycle_policy got unknown kwargs: {extra_kwargs!r}") @@ -2498,10 +2497,10 @@ def get_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2509,7 +2508,7 @@ def get_object_lifecycle_policy(self, namespace_name, bucket_name, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2595,7 +2594,7 @@ def get_preauthenticated_request(self, namespace_name, bucket_name, par_id, **kw "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_preauthenticated_request got unknown kwargs: {extra_kwargs!r}") @@ -2606,10 +2605,10 @@ def get_preauthenticated_request(self, namespace_name, bucket_name, par_id, **kw "parId": par_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2617,7 +2616,7 @@ def get_preauthenticated_request(self, namespace_name, bucket_name, par_id, **kw "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2702,7 +2701,7 @@ def get_replication_policy(self, namespace_name, bucket_name, replication_id, ** "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_replication_policy got unknown kwargs: {extra_kwargs!r}") @@ -2713,10 +2712,10 @@ def get_replication_policy(self, namespace_name, bucket_name, replication_id, ** "replicationId": replication_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2724,7 +2723,7 @@ def get_replication_policy(self, namespace_name, bucket_name, replication_id, ** "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2809,7 +2808,7 @@ def get_retention_rule(self, namespace_name, bucket_name, retention_rule_id, **k "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_retention_rule got unknown kwargs: {extra_kwargs!r}") @@ -2820,10 +2819,10 @@ def get_retention_rule(self, namespace_name, bucket_name, retention_rule_id, **k "retentionRuleId": retention_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2831,7 +2830,7 @@ def get_retention_rule(self, namespace_name, bucket_name, retention_rule_id, **k "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2909,7 +2908,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2918,10 +2917,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2929,7 +2928,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3023,7 +3022,7 @@ def head_bucket(self, namespace_name, bucket_name, **kwargs): "if_none_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_bucket got unknown kwargs: {extra_kwargs!r}") @@ -3033,10 +3032,10 @@ def head_bucket(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3046,7 +3045,7 @@ def head_bucket(self, namespace_name, bucket_name, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3169,7 +3168,7 @@ def head_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc_sse_customer_key", "opc_sse_customer_key_sha256" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_object got unknown kwargs: {extra_kwargs!r}") @@ -3180,16 +3179,16 @@ def head_object(self, namespace_name, bucket_name, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "versionId": kwargs.get("version_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3201,7 +3200,7 @@ def head_object(self, namespace_name, bucket_name, object_name, **kwargs): "opc-sse-customer-key": kwargs.get("opc_sse_customer_key", missing), "opc-sse-customer-key-sha256": kwargs.get("opc_sse_customer_key_sha256", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3314,7 +3313,7 @@ def list_buckets(self, namespace_name, compartment_id, **kwargs): "fields", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_buckets got unknown kwargs: {extra_kwargs!r}") @@ -3323,10 +3322,10 @@ def list_buckets(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -3343,14 +3342,14 @@ def list_buckets(self, namespace_name, compartment_id, **kwargs): "page": kwargs.get("page", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'csv') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3456,7 +3455,7 @@ def list_multipart_upload_parts(self, namespace_name, bucket_name, object_name, "page", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_multipart_upload_parts got unknown kwargs: {extra_kwargs!r}") @@ -3467,10 +3466,10 @@ def list_multipart_upload_parts(self, namespace_name, bucket_name, object_name, "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3478,14 +3477,14 @@ def list_multipart_upload_parts(self, namespace_name, bucket_name, object_name, "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3584,7 +3583,7 @@ def list_multipart_uploads(self, namespace_name, bucket_name, **kwargs): "page", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_multipart_uploads got unknown kwargs: {extra_kwargs!r}") @@ -3594,24 +3593,24 @@ def list_multipart_uploads(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3753,7 +3752,7 @@ def list_object_versions(self, namespace_name, bucket_name, **kwargs): "start_after", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_object_versions got unknown kwargs: {extra_kwargs!r}") @@ -3763,10 +3762,10 @@ def list_object_versions(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3779,14 +3778,14 @@ def list_object_versions(self, namespace_name, bucket_name, **kwargs): "startAfter": kwargs.get("start_after", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3923,7 +3922,7 @@ def list_objects(self, namespace_name, bucket_name, **kwargs): "opc_client_request_id", "start_after" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_objects got unknown kwargs: {extra_kwargs!r}") @@ -3933,10 +3932,10 @@ def list_objects(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3948,14 +3947,14 @@ def list_objects(self, namespace_name, bucket_name, **kwargs): "fields": kwargs.get("fields", missing), "startAfter": kwargs.get("start_after", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4058,7 +4057,7 @@ def list_preauthenticated_requests(self, namespace_name, bucket_name, **kwargs): "page", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_preauthenticated_requests got unknown kwargs: {extra_kwargs!r}") @@ -4068,10 +4067,10 @@ def list_preauthenticated_requests(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4079,14 +4078,14 @@ def list_preauthenticated_requests(self, namespace_name, bucket_name, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4185,7 +4184,7 @@ def list_replication_policies(self, namespace_name, bucket_name, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replication_policies got unknown kwargs: {extra_kwargs!r}") @@ -4195,24 +4194,24 @@ def list_replication_policies(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4311,7 +4310,7 @@ def list_replication_sources(self, namespace_name, bucket_name, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_replication_sources got unknown kwargs: {extra_kwargs!r}") @@ -4321,24 +4320,24 @@ def list_replication_sources(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4426,7 +4425,7 @@ def list_retention_rules(self, namespace_name, bucket_name, **kwargs): "retry_strategy", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_retention_rules got unknown kwargs: {extra_kwargs!r}") @@ -4436,16 +4435,16 @@ def list_retention_rules(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -4545,7 +4544,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4554,24 +4553,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4666,7 +4665,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4675,24 +4674,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4787,7 +4786,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4797,14 +4796,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4889,7 +4888,7 @@ def make_bucket_writable(self, namespace_name, bucket_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"make_bucket_writable got unknown kwargs: {extra_kwargs!r}") @@ -4899,10 +4898,10 @@ def make_bucket_writable(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4910,7 +4909,7 @@ def make_bucket_writable(self, namespace_name, bucket_name, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5124,7 +5123,7 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, "storage_tier", "opc_meta" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_object got unknown kwargs: {extra_kwargs!r}") @@ -5135,10 +5134,10 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5161,9 +5160,9 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, "storage-tier": kwargs.get("storage_tier", missing), } - for key, value in six.iteritems(kwargs.get("opc_meta", {})): + for key, value in kwargs.get("opc_meta", {}).items(): header_params[f"opc-meta-{key}"] = value - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -5176,7 +5175,7 @@ def put_object(self, namespace_name, bucket_name, object_name, put_object_body, put_object_body = kwargs.get("put_object_body", missing) if put_object_body is not missing and put_object_body is not None: - if (not isinstance(put_object_body, (six.binary_type, six.string_types)) and + if (not isinstance(put_object_body, (bytes, str)) and not hasattr(put_object_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -5286,7 +5285,7 @@ def put_object_lifecycle_policy(self, namespace_name, bucket_name, put_object_li "if_match", "if_none_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_object_lifecycle_policy got unknown kwargs: {extra_kwargs!r}") @@ -5296,10 +5295,10 @@ def put_object_lifecycle_policy(self, namespace_name, bucket_name, put_object_li "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5309,7 +5308,7 @@ def put_object_lifecycle_policy(self, namespace_name, bucket_name, put_object_li "if-match": kwargs.get("if_match", missing), "if-none-match": kwargs.get("if_none_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5407,7 +5406,7 @@ def reencrypt_bucket(self, namespace_name, bucket_name, **kwargs): "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reencrypt_bucket got unknown kwargs: {extra_kwargs!r}") @@ -5417,10 +5416,10 @@ def reencrypt_bucket(self, namespace_name, bucket_name, **kwargs): "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5428,7 +5427,7 @@ def reencrypt_bucket(self, namespace_name, bucket_name, **kwargs): "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5527,7 +5526,7 @@ def reencrypt_object(self, namespace_name, bucket_name, object_name, reencrypt_o "version_id", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reencrypt_object got unknown kwargs: {extra_kwargs!r}") @@ -5538,23 +5537,23 @@ def reencrypt_object(self, namespace_name, bucket_name, object_name, reencrypt_o "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "versionId": kwargs.get("version_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5646,7 +5645,7 @@ def rename_object(self, namespace_name, bucket_name, rename_object_details, **kw "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rename_object got unknown kwargs: {extra_kwargs!r}") @@ -5656,10 +5655,10 @@ def rename_object(self, namespace_name, bucket_name, rename_object_details, **kw "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5667,7 +5666,7 @@ def rename_object(self, namespace_name, bucket_name, rename_object_details, **kw "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5753,7 +5752,7 @@ def restore_objects(self, namespace_name, bucket_name, restore_objects_details, "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_objects got unknown kwargs: {extra_kwargs!r}") @@ -5763,10 +5762,10 @@ def restore_objects(self, namespace_name, bucket_name, restore_objects_details, "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5774,7 +5773,7 @@ def restore_objects(self, namespace_name, bucket_name, restore_objects_details, "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5871,7 +5870,7 @@ def update_bucket(self, namespace_name, bucket_name, update_bucket_details, **kw "if_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_bucket got unknown kwargs: {extra_kwargs!r}") @@ -5881,10 +5880,10 @@ def update_bucket(self, namespace_name, bucket_name, update_bucket_details, **kw "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5893,7 +5892,7 @@ def update_bucket(self, namespace_name, bucket_name, update_bucket_details, **kw "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5982,7 +5981,7 @@ def update_namespace_metadata(self, namespace_name, update_namespace_metadata_de "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_namespace_metadata got unknown kwargs: {extra_kwargs!r}") @@ -5991,10 +5990,10 @@ def update_namespace_metadata(self, namespace_name, update_namespace_metadata_de "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6002,7 +6001,7 @@ def update_namespace_metadata(self, namespace_name, update_namespace_metadata_de "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6089,7 +6088,7 @@ def update_object_storage_tier(self, namespace_name, bucket_name, update_object_ "retry_strategy", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_object_storage_tier got unknown kwargs: {extra_kwargs!r}") @@ -6099,10 +6098,10 @@ def update_object_storage_tier(self, namespace_name, bucket_name, update_object_ "bucketName": bucket_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6110,7 +6109,7 @@ def update_object_storage_tier(self, namespace_name, bucket_name, update_object_ "content-type": "application/json", "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6204,7 +6203,7 @@ def update_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "if_match", "opc_client_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_retention_rule got unknown kwargs: {extra_kwargs!r}") @@ -6215,10 +6214,10 @@ def update_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "retentionRuleId": retention_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6227,7 +6226,7 @@ def update_retention_rule(self, namespace_name, bucket_name, retention_rule_id, "if-match": kwargs.get("if_match", missing), "opc-client-request-id": kwargs.get("opc_client_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6392,7 +6391,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "opc_sse_customer_key_sha256", "opc_sse_kms_key_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_part got unknown kwargs: {extra_kwargs!r}") @@ -6403,17 +6402,17 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "uploadId": upload_id, "uploadPartNum": upload_part_num } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6428,7 +6427,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa "opc-sse-customer-key-sha256": kwargs.get("opc_sse_customer_key_sha256", missing), "opc-sse-kms-key-id": kwargs.get("opc_sse_kms_key_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # Set default value for expect header if user has not overridden it lowercase_header_params_keys = [k.lower() for k in header_params] if "expect" not in lowercase_header_params_keys: @@ -6441,7 +6440,7 @@ def upload_part(self, namespace_name, bucket_name, object_name, upload_id, uploa upload_part_body = kwargs.get("upload_part_body", missing) if upload_part_body is not missing and upload_part_body is not None: - if (not isinstance(upload_part_body, (six.binary_type, six.string_types)) and + if (not isinstance(upload_part_body, (bytes, str)) and not hasattr(upload_part_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/object_storage/transfer/internal/multipart_object_assembler.py b/src/oci/object_storage/transfer/internal/multipart_object_assembler.py index 8ccc992ca1..91245fa1ea 100644 --- a/src/oci/object_storage/transfer/internal/multipart_object_assembler.py +++ b/src/oci/object_storage/transfer/internal/multipart_object_assembler.py @@ -18,9 +18,8 @@ from ....exceptions import ServiceError, MultipartUploadError from oci.exceptions import RequestException, ConnectTimeout from oci._vendor.requests.exceptions import Timeout, ConnectionError -from oci._vendor.six.moves.queue import Queue +from queue import Queue from threading import Semaphore -from oci._vendor import six from oci.fips import is_fips_mode from ....version import __version__ @@ -396,7 +395,7 @@ def new_upload(self, **kwargs): if self.metadata: # TODO: look into moving this into codegen for create_multipart_upload like it is for put_object processed_metadata = {} - for key, value in six.iteritems(self.metadata): + for key, value in self.metadata.items(): if not key.startswith('opc-meta-'): processed_metadata["opc-meta-" + key] = value else: @@ -623,7 +622,7 @@ def upload_stream(self, stream_ref, **kwargs): # We pull data from the stream until there is no more keep_reading = True while keep_reading: - if six.PY3 and hasattr(stream_ref, 'buffer'): + if hasattr(stream_ref, 'buffer'): read_bytes = stream_ref.buffer.read(self.part_size) else: read_bytes = stream_ref.read(self.part_size) diff --git a/src/oci/oce/oce_instance_client.py b/src/oci/oce/oce_instance_client.py index ce7c2c31d5..797642c8bb 100644 --- a/src/oci/oce/oce_instance_client.py +++ b/src/oci/oce/oce_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_oce_instance_compartment(self, oce_instance_id, change_oce_instance_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oce_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_oce_instance_compartment(self, oce_instance_id, change_oce_instance_c "oceInstanceId": oce_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_oce_instance_compartment(self, oce_instance_id, change_oce_instance_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_oce_instance(self, create_oce_instance_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oce_instance got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_oce_instance(self, create_oce_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def delete_oce_instance(self, oce_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oce_instance got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def delete_oce_instance(self, oce_instance_id, **kwargs): "oceInstanceId": oce_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -403,7 +402,7 @@ def delete_oce_instance(self, oce_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -479,7 +478,7 @@ def get_oce_instance(self, oce_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oce_instance got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def get_oce_instance(self, oce_instance_id, **kwargs): "oceInstanceId": oce_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -499,7 +498,7 @@ def get_oce_instance(self, oce_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -577,7 +576,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -586,10 +585,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -597,7 +596,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -711,7 +710,7 @@ def list_oce_instances(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oce_instances got unknown kwargs: {extra_kwargs!r}") @@ -747,14 +746,14 @@ def list_oce_instances(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -840,7 +839,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -849,24 +848,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -954,7 +953,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -963,24 +962,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1072,7 +1071,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1083,14 +1082,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1179,7 +1178,7 @@ def update_oce_instance(self, oce_instance_id, update_oce_instance_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oce_instance got unknown kwargs: {extra_kwargs!r}") @@ -1188,10 +1187,10 @@ def update_oce_instance(self, oce_instance_id, update_oce_instance_details, **kw "oceInstanceId": oce_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1200,7 +1199,7 @@ def update_oce_instance(self, oce_instance_id, update_oce_instance_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/oci_control_center/occ_metrics_client.py b/src/oci/oci_control_center/occ_metrics_client.py index 4c171c240a..955f3c165c 100644 --- a/src/oci/oci_control_center/occ_metrics_client.py +++ b/src/oci/oci_control_center/occ_metrics_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def list_metric_properties(self, namespace_name, compartment_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_metric_properties got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def list_metric_properties(self, namespace_name, compartment_id, **kwargs): "namespaceName": namespace_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -190,14 +189,14 @@ def list_metric_properties(self, namespace_name, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def list_namespaces(self, compartment_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -296,14 +295,14 @@ def list_namespaces(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def request_summarized_metric_data(self, request_summarized_metric_data_details, "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_metric_data got unknown kwargs: {extra_kwargs!r}") @@ -401,14 +400,14 @@ def request_summarized_metric_data(self, request_summarized_metric_data_details, "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ocvp/cluster_client.py b/src/oci/ocvp/cluster_client.py index 3cc64a50f0..8f8a46bc8c 100644 --- a/src/oci/ocvp/cluster_client.py +++ b/src/oci/ocvp/cluster_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -175,7 +174,7 @@ def create_cluster(self, create_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cluster got unknown kwargs: {extra_kwargs!r}") @@ -186,7 +185,7 @@ def create_cluster(self, create_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def delete_cluster(self, cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_cluster got unknown kwargs: {extra_kwargs!r}") @@ -288,10 +287,10 @@ def delete_cluster(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -300,7 +299,7 @@ def delete_cluster(self, cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -379,7 +378,7 @@ def get_cluster(self, cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_cluster got unknown kwargs: {extra_kwargs!r}") @@ -388,10 +387,10 @@ def get_cluster(self, cluster_id, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -399,7 +398,7 @@ def get_cluster(self, cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -533,7 +532,7 @@ def list_clusters(self, **kwargs): "lifecycle_state", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_clusters got unknown kwargs: {extra_kwargs!r}") @@ -569,14 +568,14 @@ def list_clusters(self, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -672,7 +671,7 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_cluster got unknown kwargs: {extra_kwargs!r}") @@ -681,10 +680,10 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "clusterId": cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -693,7 +692,7 @@ def update_cluster(self, cluster_id, update_cluster_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ocvp/esxi_host_client.py b/src/oci/ocvp/esxi_host_client.py index a1324ca7a2..6e02d171e2 100644 --- a/src/oci/ocvp/esxi_host_client.py +++ b/src/oci/ocvp/esxi_host_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def create_esxi_host(self, create_esxi_host_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -184,7 +183,7 @@ def create_esxi_host(self, create_esxi_host_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -285,7 +284,7 @@ def delete_esxi_host(self, esxi_host_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -294,10 +293,10 @@ def delete_esxi_host(self, esxi_host_id, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -306,7 +305,7 @@ def delete_esxi_host(self, esxi_host_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -385,7 +384,7 @@ def get_esxi_host(self, esxi_host_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -394,10 +393,10 @@ def get_esxi_host(self, esxi_host_id, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def get_esxi_host(self, esxi_host_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -502,7 +501,7 @@ def inplace_upgrade(self, esxi_host_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"inplace_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -511,10 +510,10 @@ def inplace_upgrade(self, esxi_host_id, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -524,7 +523,7 @@ def inplace_upgrade(self, esxi_host_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -685,7 +684,7 @@ def list_esxi_hosts(self, **kwargs): "is_swap_billing_only", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_esxi_hosts got unknown kwargs: {extra_kwargs!r}") @@ -725,14 +724,14 @@ def list_esxi_hosts(self, **kwargs): "isSwapBillingOnly": kwargs.get("is_swap_billing_only", missing), "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -832,7 +831,7 @@ def replace_host(self, esxi_host_id, replace_host_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"replace_host got unknown kwargs: {extra_kwargs!r}") @@ -841,10 +840,10 @@ def replace_host(self, esxi_host_id, replace_host_details, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -854,7 +853,7 @@ def replace_host(self, esxi_host_id, replace_host_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -957,7 +956,7 @@ def swap_billing(self, esxi_host_id, swap_billing_host_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"swap_billing got unknown kwargs: {extra_kwargs!r}") @@ -966,16 +965,16 @@ def swap_billing(self, esxi_host_id, swap_billing_host_id, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "swapBillingHostId": swap_billing_host_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -984,7 +983,7 @@ def swap_billing(self, esxi_host_id, swap_billing_host_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1077,7 +1076,7 @@ def update_esxi_host(self, esxi_host_id, update_esxi_host_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -1086,10 +1085,10 @@ def update_esxi_host(self, esxi_host_id, update_esxi_host_details, **kwargs): "esxiHostId": esxi_host_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1098,7 +1097,7 @@ def update_esxi_host(self, esxi_host_id, update_esxi_host_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ocvp/sddc_client.py b/src/oci/ocvp/sddc_client.py index 3a0f82f03c..7cb6347cdc 100644 --- a/src/oci/ocvp/sddc_client.py +++ b/src/oci/ocvp/sddc_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def cancel_downgrade_hcx(self, sddc_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_downgrade_hcx got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def cancel_downgrade_hcx(self, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def cancel_downgrade_hcx(self, sddc_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -303,7 +302,7 @@ def change_sddc_compartment(self, sddc_id, change_sddc_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_sddc_compartment got unknown kwargs: {extra_kwargs!r}") @@ -312,10 +311,10 @@ def change_sddc_compartment(self, sddc_id, change_sddc_compartment_details, **kw "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -325,7 +324,7 @@ def change_sddc_compartment(self, sddc_id, change_sddc_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -420,7 +419,7 @@ def create_sddc(self, create_sddc_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sddc got unknown kwargs: {extra_kwargs!r}") @@ -431,7 +430,7 @@ def create_sddc(self, create_sddc_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -524,7 +523,7 @@ def delete_sddc(self, sddc_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_sddc got unknown kwargs: {extra_kwargs!r}") @@ -533,10 +532,10 @@ def delete_sddc(self, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -545,7 +544,7 @@ def delete_sddc(self, sddc_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -647,7 +646,7 @@ def downgrade_hcx(self, downgrade_hcx_details, sddc_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"downgrade_hcx got unknown kwargs: {extra_kwargs!r}") @@ -656,10 +655,10 @@ def downgrade_hcx(self, downgrade_hcx_details, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -669,7 +668,7 @@ def downgrade_hcx(self, downgrade_hcx_details, sddc_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -751,7 +750,7 @@ def get_sddc(self, sddc_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sddc got unknown kwargs: {extra_kwargs!r}") @@ -760,10 +759,10 @@ def get_sddc(self, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -771,7 +770,7 @@ def get_sddc(self, sddc_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -905,7 +904,7 @@ def list_sddcs(self, compartment_id, **kwargs): "opc_request_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sddcs got unknown kwargs: {extra_kwargs!r}") @@ -941,14 +940,14 @@ def list_sddcs(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1049,7 +1048,7 @@ def list_supported_commitments(self, compartment_id, **kwargs): "opc_request_id", "host_shape_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_supported_commitments got unknown kwargs: {extra_kwargs!r}") @@ -1060,14 +1059,14 @@ def list_supported_commitments(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "hostShapeName": kwargs.get("host_shape_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1176,7 +1175,7 @@ def list_supported_host_shapes(self, compartment_id, **kwargs): "is_single_host_sddc_supported", "initial_host_shape_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_supported_host_shapes got unknown kwargs: {extra_kwargs!r}") @@ -1189,14 +1188,14 @@ def list_supported_host_shapes(self, compartment_id, **kwargs): "isSingleHostSddcSupported": kwargs.get("is_single_host_sddc_supported", missing), "initialHostShapeName": kwargs.get("initial_host_shape_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1302,7 +1301,7 @@ def list_supported_vmware_software_versions(self, compartment_id, **kwargs): "version", "host_shape_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_supported_vmware_software_versions got unknown kwargs: {extra_kwargs!r}") @@ -1314,14 +1313,14 @@ def list_supported_vmware_software_versions(self, compartment_id, **kwargs): "version": kwargs.get("version", missing), "hostShapeName": kwargs.get("host_shape_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1418,7 +1417,7 @@ def refresh_hcx_license_status(self, sddc_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_hcx_license_status got unknown kwargs: {extra_kwargs!r}") @@ -1427,10 +1426,10 @@ def refresh_hcx_license_status(self, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1440,7 +1439,7 @@ def refresh_hcx_license_status(self, sddc_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1541,7 +1540,7 @@ def retrieve_password(self, sddc_id, type, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_password got unknown kwargs: {extra_kwargs!r}") @@ -1550,10 +1549,10 @@ def retrieve_password(self, sddc_id, type, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') type_allowed_values = ["VCENTER", "NSX", "HCX"] @@ -1565,7 +1564,7 @@ def retrieve_password(self, sddc_id, type, **kwargs): query_params = { "type": type } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1574,7 +1573,7 @@ def retrieve_password(self, sddc_id, type, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1674,7 +1673,7 @@ def update_sddc(self, sddc_id, update_sddc_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sddc got unknown kwargs: {extra_kwargs!r}") @@ -1683,10 +1682,10 @@ def update_sddc(self, sddc_id, update_sddc_details, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1695,7 +1694,7 @@ def update_sddc(self, sddc_id, update_sddc_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1794,7 +1793,7 @@ def upgrade_hcx(self, sddc_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upgrade_hcx got unknown kwargs: {extra_kwargs!r}") @@ -1803,10 +1802,10 @@ def upgrade_hcx(self, sddc_id, **kwargs): "sddcId": sddc_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1816,7 +1815,7 @@ def upgrade_hcx(self, sddc_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ocvp/work_request_client.py b/src/oci/ocvp/work_request_client.py index 81f2b0644f..92cc5c774a 100644 --- a/src/oci/ocvp/work_request_client.py +++ b/src/oci/ocvp/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -171,10 +170,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -182,7 +181,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -288,24 +287,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -404,7 +403,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -413,24 +412,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -535,7 +534,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -546,14 +545,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/oda/management_client.py b/src/oci/oda/management_client.py index 0b26533ecc..c02f12cb15 100644 --- a/src/oci/oda/management_client.py +++ b/src/oci/oda/management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def bulk_create_skill_entities(self, oda_instance_id, skill_id, bulk_create_skil "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_create_skill_entities got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def bulk_create_skill_entities(self, oda_instance_id, skill_id, bulk_create_skil "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -195,7 +194,7 @@ def bulk_create_skill_entities(self, oda_instance_id, skill_id, bulk_create_skil "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -295,7 +294,7 @@ def cascading_delete_skill_custom_entities(self, oda_instance_id, skill_id, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cascading_delete_skill_custom_entities got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def cascading_delete_skill_custom_entities(self, oda_instance_id, skill_id, **kw "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -318,7 +317,7 @@ def cascading_delete_skill_custom_entities(self, oda_instance_id, skill_id, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -422,7 +421,7 @@ def change_oda_private_endpoint_compartment(self, oda_private_endpoint_id, chang "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oda_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -431,10 +430,10 @@ def change_oda_private_endpoint_compartment(self, oda_private_endpoint_id, chang "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -444,7 +443,7 @@ def change_oda_private_endpoint_compartment(self, oda_private_endpoint_id, chang "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -526,7 +525,7 @@ def configure_digital_assistant_parameters(self, oda_instance_id, configure_digi "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"configure_digital_assistant_parameters got unknown kwargs: {extra_kwargs!r}") @@ -535,10 +534,10 @@ def configure_digital_assistant_parameters(self, oda_instance_id, configure_digi "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -546,7 +545,7 @@ def configure_digital_assistant_parameters(self, oda_instance_id, configure_digi "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -636,7 +635,7 @@ def create_authentication_provider(self, oda_instance_id, create_authentication_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_authentication_provider got unknown kwargs: {extra_kwargs!r}") @@ -645,10 +644,10 @@ def create_authentication_provider(self, oda_instance_id, create_authentication_ "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -657,7 +656,7 @@ def create_authentication_provider(self, oda_instance_id, create_authentication_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -750,7 +749,7 @@ def create_channel(self, oda_instance_id, create_channel_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_channel got unknown kwargs: {extra_kwargs!r}") @@ -759,10 +758,10 @@ def create_channel(self, oda_instance_id, create_channel_details, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -771,7 +770,7 @@ def create_channel(self, oda_instance_id, create_channel_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -864,7 +863,7 @@ def create_digital_assistant(self, oda_instance_id, create_digital_assistant_det "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -873,10 +872,10 @@ def create_digital_assistant(self, oda_instance_id, create_digital_assistant_det "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -885,7 +884,7 @@ def create_digital_assistant(self, oda_instance_id, create_digital_assistant_det "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -976,7 +975,7 @@ def create_oda_private_endpoint(self, create_oda_private_endpoint_details, **kwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oda_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -987,7 +986,7 @@ def create_oda_private_endpoint(self, create_oda_private_endpoint_details, **kwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1078,7 +1077,7 @@ def create_oda_private_endpoint_attachment(self, create_oda_private_endpoint_att "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oda_private_endpoint_attachment got unknown kwargs: {extra_kwargs!r}") @@ -1089,7 +1088,7 @@ def create_oda_private_endpoint_attachment(self, create_oda_private_endpoint_att "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1185,7 +1184,7 @@ def create_oda_private_endpoint_scan_proxy(self, create_oda_private_endpoint_sca "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oda_private_endpoint_scan_proxy got unknown kwargs: {extra_kwargs!r}") @@ -1194,10 +1193,10 @@ def create_oda_private_endpoint_scan_proxy(self, create_oda_private_endpoint_sca "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1206,7 +1205,7 @@ def create_oda_private_endpoint_scan_proxy(self, create_oda_private_endpoint_sca "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1299,7 +1298,7 @@ def create_skill(self, oda_instance_id, create_skill_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_skill got unknown kwargs: {extra_kwargs!r}") @@ -1308,10 +1307,10 @@ def create_skill(self, oda_instance_id, create_skill_details, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1320,7 +1319,7 @@ def create_skill(self, oda_instance_id, create_skill_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1414,7 +1413,7 @@ def create_skill_parameter(self, oda_instance_id, skill_id, create_skill_paramet "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_skill_parameter got unknown kwargs: {extra_kwargs!r}") @@ -1424,10 +1423,10 @@ def create_skill_parameter(self, oda_instance_id, skill_id, create_skill_paramet "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1436,7 +1435,7 @@ def create_skill_parameter(self, oda_instance_id, skill_id, create_skill_paramet "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1529,7 +1528,7 @@ def create_translator(self, oda_instance_id, create_translator_details, **kwargs "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_translator got unknown kwargs: {extra_kwargs!r}") @@ -1538,10 +1537,10 @@ def create_translator(self, oda_instance_id, create_translator_details, **kwargs "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1550,7 +1549,7 @@ def create_translator(self, oda_instance_id, create_translator_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1643,7 +1642,7 @@ def delete_authentication_provider(self, oda_instance_id, authentication_provide "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_authentication_provider got unknown kwargs: {extra_kwargs!r}") @@ -1653,10 +1652,10 @@ def delete_authentication_provider(self, oda_instance_id, authentication_provide "authenticationProviderId": authentication_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1665,7 +1664,7 @@ def delete_authentication_provider(self, oda_instance_id, authentication_provide "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1753,7 +1752,7 @@ def delete_channel(self, oda_instance_id, channel_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_channel got unknown kwargs: {extra_kwargs!r}") @@ -1763,10 +1762,10 @@ def delete_channel(self, oda_instance_id, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1775,7 +1774,7 @@ def delete_channel(self, oda_instance_id, channel_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1863,7 +1862,7 @@ def delete_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwar "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -1873,10 +1872,10 @@ def delete_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwar "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1885,7 +1884,7 @@ def delete_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwar "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1973,7 +1972,7 @@ def delete_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oda_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1982,10 +1981,10 @@ def delete_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1994,7 +1993,7 @@ def delete_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2082,7 +2081,7 @@ def delete_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oda_private_endpoint_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2091,10 +2090,10 @@ def delete_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment "odaPrivateEndpointAttachmentId": oda_private_endpoint_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2103,7 +2102,7 @@ def delete_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2194,7 +2193,7 @@ def delete_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oda_private_endpoint_scan_proxy got unknown kwargs: {extra_kwargs!r}") @@ -2204,10 +2203,10 @@ def delete_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2216,7 +2215,7 @@ def delete_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2304,7 +2303,7 @@ def delete_skill(self, oda_instance_id, skill_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_skill got unknown kwargs: {extra_kwargs!r}") @@ -2314,10 +2313,10 @@ def delete_skill(self, oda_instance_id, skill_id, **kwargs): "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2326,7 +2325,7 @@ def delete_skill(self, oda_instance_id, skill_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2417,7 +2416,7 @@ def delete_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_skill_parameter got unknown kwargs: {extra_kwargs!r}") @@ -2428,10 +2427,10 @@ def delete_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kw "parameterName": parameter_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2440,7 +2439,7 @@ def delete_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2528,7 +2527,7 @@ def delete_translator(self, oda_instance_id, translator_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_translator got unknown kwargs: {extra_kwargs!r}") @@ -2538,10 +2537,10 @@ def delete_translator(self, oda_instance_id, translator_id, **kwargs): "translatorId": translator_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2550,7 +2549,7 @@ def delete_translator(self, oda_instance_id, translator_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2632,7 +2631,7 @@ def export_digital_assistant(self, oda_instance_id, digital_assistant_id, export "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -2642,10 +2641,10 @@ def export_digital_assistant(self, oda_instance_id, digital_assistant_id, export "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2653,7 +2652,7 @@ def export_digital_assistant(self, oda_instance_id, digital_assistant_id, export "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2737,7 +2736,7 @@ def export_skill(self, oda_instance_id, skill_id, export_skill_details, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_skill got unknown kwargs: {extra_kwargs!r}") @@ -2747,10 +2746,10 @@ def export_skill(self, oda_instance_id, skill_id, export_skill_details, **kwargs "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2758,7 +2757,7 @@ def export_skill(self, oda_instance_id, skill_id, export_skill_details, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2845,7 +2844,7 @@ def get_authentication_provider(self, oda_instance_id, authentication_provider_i "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_authentication_provider got unknown kwargs: {extra_kwargs!r}") @@ -2855,10 +2854,10 @@ def get_authentication_provider(self, oda_instance_id, authentication_provider_i "authenticationProviderId": authentication_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2867,7 +2866,7 @@ def get_authentication_provider(self, oda_instance_id, authentication_provider_i "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2954,7 +2953,7 @@ def get_channel(self, oda_instance_id, channel_id, **kwargs): "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_channel got unknown kwargs: {extra_kwargs!r}") @@ -2964,10 +2963,10 @@ def get_channel(self, oda_instance_id, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2976,7 +2975,7 @@ def get_channel(self, oda_instance_id, channel_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3063,7 +3062,7 @@ def get_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwargs) "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -3073,10 +3072,10 @@ def get_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwargs) "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3085,7 +3084,7 @@ def get_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwargs) "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3175,7 +3174,7 @@ def get_digital_assistant_parameter(self, oda_instance_id, digital_assistant_id, "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_digital_assistant_parameter got unknown kwargs: {extra_kwargs!r}") @@ -3186,10 +3185,10 @@ def get_digital_assistant_parameter(self, oda_instance_id, digital_assistant_id, "parameterName": parameter_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3198,7 +3197,7 @@ def get_digital_assistant_parameter(self, oda_instance_id, digital_assistant_id, "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3278,7 +3277,7 @@ def get_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oda_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3287,10 +3286,10 @@ def get_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3298,7 +3297,7 @@ def get_oda_private_endpoint(self, oda_private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3378,7 +3377,7 @@ def get_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oda_private_endpoint_attachment got unknown kwargs: {extra_kwargs!r}") @@ -3387,10 +3386,10 @@ def get_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment_id "odaPrivateEndpointAttachmentId": oda_private_endpoint_attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3398,7 +3397,7 @@ def get_oda_private_endpoint_attachment(self, oda_private_endpoint_attachment_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3481,7 +3480,7 @@ def get_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy_id "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oda_private_endpoint_scan_proxy got unknown kwargs: {extra_kwargs!r}") @@ -3491,10 +3490,10 @@ def get_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy_id "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3502,7 +3501,7 @@ def get_oda_private_endpoint_scan_proxy(self, oda_private_endpoint_scan_proxy_id "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3589,7 +3588,7 @@ def get_skill(self, oda_instance_id, skill_id, **kwargs): "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_skill got unknown kwargs: {extra_kwargs!r}") @@ -3599,10 +3598,10 @@ def get_skill(self, oda_instance_id, skill_id, **kwargs): "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3611,7 +3610,7 @@ def get_skill(self, oda_instance_id, skill_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3701,7 +3700,7 @@ def get_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kwarg "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_skill_parameter got unknown kwargs: {extra_kwargs!r}") @@ -3712,10 +3711,10 @@ def get_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kwarg "parameterName": parameter_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3724,7 +3723,7 @@ def get_skill_parameter(self, oda_instance_id, skill_id, parameter_name, **kwarg "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3811,7 +3810,7 @@ def get_translator(self, oda_instance_id, translator_id, **kwargs): "if_none_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_translator got unknown kwargs: {extra_kwargs!r}") @@ -3821,10 +3820,10 @@ def get_translator(self, oda_instance_id, translator_id, **kwargs): "translatorId": translator_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3833,7 +3832,7 @@ def get_translator(self, oda_instance_id, translator_id, **kwargs): "if-none-match": kwargs.get("if_none_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3923,7 +3922,7 @@ def import_bot(self, oda_instance_id, import_bot_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"import_bot got unknown kwargs: {extra_kwargs!r}") @@ -3932,10 +3931,10 @@ def import_bot(self, oda_instance_id, import_bot_details, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3944,7 +3943,7 @@ def import_bot(self, oda_instance_id, import_bot_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4077,7 +4076,7 @@ def list_authentication_providers(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_authentication_providers got unknown kwargs: {extra_kwargs!r}") @@ -4086,10 +4085,10 @@ def list_authentication_providers(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'identity_provider' in kwargs: @@ -4130,14 +4129,14 @@ def list_authentication_providers(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4276,7 +4275,7 @@ def list_channels(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_channels got unknown kwargs: {extra_kwargs!r}") @@ -4285,10 +4284,10 @@ def list_channels(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'category' in kwargs: @@ -4337,14 +4336,14 @@ def list_channels(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4468,7 +4467,7 @@ def list_digital_assistant_parameters(self, oda_instance_id, digital_assistant_i "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_digital_assistant_parameters got unknown kwargs: {extra_kwargs!r}") @@ -4478,10 +4477,10 @@ def list_digital_assistant_parameters(self, oda_instance_id, digital_assistant_i "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -4513,14 +4512,14 @@ def list_digital_assistant_parameters(self, oda_instance_id, digital_assistant_i "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4672,7 +4671,7 @@ def list_digital_assistants(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_digital_assistants got unknown kwargs: {extra_kwargs!r}") @@ -4681,10 +4680,10 @@ def list_digital_assistants(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -4722,14 +4721,14 @@ def list_digital_assistants(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4851,7 +4850,7 @@ def list_oda_private_endpoint_attachments(self, oda_private_endpoint_id, compart "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oda_private_endpoint_attachments got unknown kwargs: {extra_kwargs!r}") @@ -4886,14 +4885,14 @@ def list_oda_private_endpoint_attachments(self, oda_private_endpoint_id, compart "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5011,7 +5010,7 @@ def list_oda_private_endpoint_scan_proxies(self, oda_private_endpoint_id, **kwar "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oda_private_endpoint_scan_proxies got unknown kwargs: {extra_kwargs!r}") @@ -5020,10 +5019,10 @@ def list_oda_private_endpoint_scan_proxies(self, oda_private_endpoint_id, **kwar "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -5054,14 +5053,14 @@ def list_oda_private_endpoint_scan_proxies(self, oda_private_endpoint_id, **kwar "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5185,7 +5184,7 @@ def list_oda_private_endpoints(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oda_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -5220,14 +5219,14 @@ def list_oda_private_endpoints(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5349,7 +5348,7 @@ def list_skill_parameters(self, oda_instance_id, skill_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_skill_parameters got unknown kwargs: {extra_kwargs!r}") @@ -5359,10 +5358,10 @@ def list_skill_parameters(self, oda_instance_id, skill_id, **kwargs): "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -5394,14 +5393,14 @@ def list_skill_parameters(self, oda_instance_id, skill_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5553,7 +5552,7 @@ def list_skills(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_skills got unknown kwargs: {extra_kwargs!r}") @@ -5562,10 +5561,10 @@ def list_skills(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -5603,14 +5602,14 @@ def list_skills(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5744,7 +5743,7 @@ def list_translators(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_translators got unknown kwargs: {extra_kwargs!r}") @@ -5753,10 +5752,10 @@ def list_translators(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'type' in kwargs: @@ -5797,14 +5796,14 @@ def list_translators(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5897,7 +5896,7 @@ def publish_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -5907,10 +5906,10 @@ def publish_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwa "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5919,7 +5918,7 @@ def publish_digital_assistant(self, oda_instance_id, digital_assistant_id, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6010,7 +6009,7 @@ def publish_skill(self, oda_instance_id, skill_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_skill got unknown kwargs: {extra_kwargs!r}") @@ -6020,10 +6019,10 @@ def publish_skill(self, oda_instance_id, skill_id, **kwargs): "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6032,7 +6031,7 @@ def publish_skill(self, oda_instance_id, skill_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6124,7 +6123,7 @@ def rotate_channel_keys(self, oda_instance_id, channel_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_channel_keys got unknown kwargs: {extra_kwargs!r}") @@ -6134,10 +6133,10 @@ def rotate_channel_keys(self, oda_instance_id, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6146,7 +6145,7 @@ def rotate_channel_keys(self, oda_instance_id, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6236,7 +6235,7 @@ def start_channel(self, oda_instance_id, channel_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_channel got unknown kwargs: {extra_kwargs!r}") @@ -6246,10 +6245,10 @@ def start_channel(self, oda_instance_id, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6258,7 +6257,7 @@ def start_channel(self, oda_instance_id, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6348,7 +6347,7 @@ def stop_channel(self, oda_instance_id, channel_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_channel got unknown kwargs: {extra_kwargs!r}") @@ -6358,10 +6357,10 @@ def stop_channel(self, oda_instance_id, channel_id, **kwargs): "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6370,7 +6369,7 @@ def stop_channel(self, oda_instance_id, channel_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6472,7 +6471,7 @@ def train_skill(self, oda_instance_id, skill_id, train_skill_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"train_skill got unknown kwargs: {extra_kwargs!r}") @@ -6482,10 +6481,10 @@ def train_skill(self, oda_instance_id, skill_id, train_skill_details, **kwargs): "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6495,7 +6494,7 @@ def train_skill(self, oda_instance_id, skill_id, train_skill_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6589,7 +6588,7 @@ def update_authentication_provider(self, oda_instance_id, authentication_provide "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_authentication_provider got unknown kwargs: {extra_kwargs!r}") @@ -6599,10 +6598,10 @@ def update_authentication_provider(self, oda_instance_id, authentication_provide "authenticationProviderId": authentication_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6611,7 +6610,7 @@ def update_authentication_provider(self, oda_instance_id, authentication_provide "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6706,7 +6705,7 @@ def update_channel(self, oda_instance_id, channel_id, update_channel_details, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_channel got unknown kwargs: {extra_kwargs!r}") @@ -6716,10 +6715,10 @@ def update_channel(self, oda_instance_id, channel_id, update_channel_details, ** "channelId": channel_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6728,7 +6727,7 @@ def update_channel(self, oda_instance_id, channel_id, update_channel_details, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6823,7 +6822,7 @@ def update_digital_assistant(self, oda_instance_id, digital_assistant_id, update "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_digital_assistant got unknown kwargs: {extra_kwargs!r}") @@ -6833,10 +6832,10 @@ def update_digital_assistant(self, oda_instance_id, digital_assistant_id, update "digitalAssistantId": digital_assistant_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6845,7 +6844,7 @@ def update_digital_assistant(self, oda_instance_id, digital_assistant_id, update "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6943,7 +6942,7 @@ def update_digital_assistant_parameter(self, oda_instance_id, digital_assistant_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_digital_assistant_parameter got unknown kwargs: {extra_kwargs!r}") @@ -6954,10 +6953,10 @@ def update_digital_assistant_parameter(self, oda_instance_id, digital_assistant_ "parameterName": parameter_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6966,7 +6965,7 @@ def update_digital_assistant_parameter(self, oda_instance_id, digital_assistant_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7060,7 +7059,7 @@ def update_oda_private_endpoint(self, oda_private_endpoint_id, update_oda_privat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oda_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -7069,10 +7068,10 @@ def update_oda_private_endpoint(self, oda_private_endpoint_id, update_oda_privat "odaPrivateEndpointId": oda_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7081,7 +7080,7 @@ def update_oda_private_endpoint(self, oda_private_endpoint_id, update_oda_privat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7174,7 +7173,7 @@ def update_skill(self, oda_instance_id, skill_id, update_skill_details, **kwargs "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_skill got unknown kwargs: {extra_kwargs!r}") @@ -7184,10 +7183,10 @@ def update_skill(self, oda_instance_id, skill_id, update_skill_details, **kwargs "skillId": skill_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7196,7 +7195,7 @@ def update_skill(self, oda_instance_id, skill_id, update_skill_details, **kwargs "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7294,7 +7293,7 @@ def update_skill_parameter(self, oda_instance_id, skill_id, parameter_name, upda "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_skill_parameter got unknown kwargs: {extra_kwargs!r}") @@ -7305,10 +7304,10 @@ def update_skill_parameter(self, oda_instance_id, skill_id, parameter_name, upda "parameterName": parameter_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7317,7 +7316,7 @@ def update_skill_parameter(self, oda_instance_id, skill_id, parameter_name, upda "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7412,7 +7411,7 @@ def update_translator(self, oda_instance_id, translator_id, update_translator_de "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_translator got unknown kwargs: {extra_kwargs!r}") @@ -7422,10 +7421,10 @@ def update_translator(self, oda_instance_id, translator_id, update_translator_de "translatorId": translator_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7434,7 +7433,7 @@ def update_translator(self, oda_instance_id, translator_id, update_translator_de "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/oda/oda_client.py b/src/oci/oda/oda_client.py index eea657a6bb..4ef94d1c99 100644 --- a/src/oci/oda/oda_client.py +++ b/src/oci/oda/oda_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def change_oda_instance_compartment(self, oda_instance_id, change_oda_instance_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oda_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def change_oda_instance_compartment(self, oda_instance_id, change_oda_instance_c "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def change_oda_instance_compartment(self, oda_instance_id, change_oda_instance_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -293,7 +292,7 @@ def create_oda_instance(self, create_oda_instance_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -304,7 +303,7 @@ def create_oda_instance(self, create_oda_instance_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -398,7 +397,7 @@ def create_oda_instance_attachment(self, oda_instance_id, create_oda_instance_at "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oda_instance_attachment got unknown kwargs: {extra_kwargs!r}") @@ -407,10 +406,10 @@ def create_oda_instance_attachment(self, oda_instance_id, create_oda_instance_at "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -419,7 +418,7 @@ def create_oda_instance_attachment(self, oda_instance_id, create_oda_instance_at "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -512,7 +511,7 @@ def delete_oda_instance(self, oda_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -521,16 +520,16 @@ def delete_oda_instance(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "retentionTime": kwargs.get("retention_time", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -538,7 +537,7 @@ def delete_oda_instance(self, oda_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -628,7 +627,7 @@ def delete_oda_instance_attachment(self, oda_instance_id, attachment_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oda_instance_attachment got unknown kwargs: {extra_kwargs!r}") @@ -638,10 +637,10 @@ def delete_oda_instance_attachment(self, oda_instance_id, attachment_id, **kwarg "attachmentId": attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -650,7 +649,7 @@ def delete_oda_instance_attachment(self, oda_instance_id, attachment_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -726,7 +725,7 @@ def get_oda_instance(self, oda_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -735,10 +734,10 @@ def get_oda_instance(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -746,7 +745,7 @@ def get_oda_instance(self, oda_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -831,7 +830,7 @@ def get_oda_instance_attachment(self, oda_instance_id, attachment_id, **kwargs): "include_owner_metadata", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oda_instance_attachment got unknown kwargs: {extra_kwargs!r}") @@ -841,23 +840,23 @@ def get_oda_instance_attachment(self, oda_instance_id, attachment_id, **kwargs): "attachmentId": attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "includeOwnerMetadata": kwargs.get("include_owner_metadata", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -940,7 +939,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -949,10 +948,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -960,7 +959,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1074,7 +1073,7 @@ def list_oda_instance_attachments(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oda_instance_attachments got unknown kwargs: {extra_kwargs!r}") @@ -1083,10 +1082,10 @@ def list_oda_instance_attachments(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -1118,14 +1117,14 @@ def list_oda_instance_attachments(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1249,7 +1248,7 @@ def list_oda_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_oda_instances got unknown kwargs: {extra_kwargs!r}") @@ -1284,14 +1283,14 @@ def list_oda_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1400,7 +1399,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1409,10 +1408,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1435,14 +1434,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1553,7 +1552,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1562,10 +1561,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1588,14 +1587,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1714,7 +1713,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1742,14 +1741,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1846,7 +1845,7 @@ def start_oda_instance(self, oda_instance_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -1855,10 +1854,10 @@ def start_oda_instance(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1868,7 +1867,7 @@ def start_oda_instance(self, oda_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1965,7 +1964,7 @@ def stop_oda_instance(self, oda_instance_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -1974,10 +1973,10 @@ def stop_oda_instance(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1987,7 +1986,7 @@ def stop_oda_instance(self, oda_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2076,7 +2075,7 @@ def update_oda_instance(self, oda_instance_id, update_oda_instance_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oda_instance got unknown kwargs: {extra_kwargs!r}") @@ -2085,10 +2084,10 @@ def update_oda_instance(self, oda_instance_id, update_oda_instance_details, **kw "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2097,7 +2096,7 @@ def update_oda_instance(self, oda_instance_id, update_oda_instance_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2192,7 +2191,7 @@ def update_oda_instance_attachment(self, oda_instance_id, attachment_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oda_instance_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2202,10 +2201,10 @@ def update_oda_instance_attachment(self, oda_instance_id, attachment_id, update_ "attachmentId": attachment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2214,7 +2213,7 @@ def update_oda_instance_attachment(self, oda_instance_id, attachment_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/oda/odapackage_client.py b/src/oci/oda/odapackage_client.py index a3f50fff29..db75158d92 100644 --- a/src/oci/oda/odapackage_client.py +++ b/src/oci/oda/odapackage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def create_imported_package(self, create_imported_package_details, oda_instance_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_imported_package got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def create_imported_package(self, create_imported_package_details, oda_instance_ "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -194,7 +193,7 @@ def create_imported_package(self, create_imported_package_details, oda_instance_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def delete_imported_package(self, oda_instance_id, package_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_imported_package got unknown kwargs: {extra_kwargs!r}") @@ -309,10 +308,10 @@ def delete_imported_package(self, oda_instance_id, package_id, **kwargs): "packageId": package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -322,7 +321,7 @@ def delete_imported_package(self, oda_instance_id, package_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -402,7 +401,7 @@ def get_imported_package(self, oda_instance_id, package_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_imported_package got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,10 @@ def get_imported_package(self, oda_instance_id, package_id, **kwargs): "packageId": package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -423,7 +422,7 @@ def get_imported_package(self, oda_instance_id, package_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -504,7 +503,7 @@ def get_package(self, oda_instance_id, package_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_package got unknown kwargs: {extra_kwargs!r}") @@ -514,10 +513,10 @@ def get_package(self, oda_instance_id, package_id, **kwargs): "packageId": package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -525,7 +524,7 @@ def get_package(self, oda_instance_id, package_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -636,7 +635,7 @@ def list_imported_packages(self, oda_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_imported_packages got unknown kwargs: {extra_kwargs!r}") @@ -645,10 +644,10 @@ def list_imported_packages(self, oda_instance_id, **kwargs): "odaInstanceId": oda_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -672,14 +671,14 @@ def list_imported_packages(self, oda_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -824,7 +823,7 @@ def list_packages(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_packages got unknown kwargs: {extra_kwargs!r}") @@ -855,14 +854,14 @@ def list_packages(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -971,7 +970,7 @@ def update_imported_package(self, update_imported_package_details, oda_instance_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_imported_package got unknown kwargs: {extra_kwargs!r}") @@ -981,16 +980,16 @@ def update_imported_package(self, update_imported_package_details, oda_instance_ "packageId": package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isReplaceSkills": kwargs.get("is_replace_skills", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -999,7 +998,7 @@ def update_imported_package(self, update_imported_package_details, oda_instance_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/billing_schedule_client.py b/src/oci/onesubscription/billing_schedule_client.py index 8aae11be2b..eb077e91f1 100644 --- a/src/oci/onesubscription/billing_schedule_client.py +++ b/src/oci/onesubscription/billing_schedule_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def list_billing_schedules(self, compartment_id, subscription_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_billing_schedules got unknown kwargs: {extra_kwargs!r}") @@ -216,14 +215,14 @@ def list_billing_schedules(self, compartment_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/commitment_client.py b/src/oci/onesubscription/commitment_client.py index e793e3f9f4..36e72ac16c 100644 --- a/src/oci/onesubscription/commitment_client.py +++ b/src/oci/onesubscription/commitment_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -158,7 +157,7 @@ def get_commitment(self, commitment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_commitment got unknown kwargs: {extra_kwargs!r}") @@ -167,10 +166,10 @@ def get_commitment(self, commitment_id, **kwargs): "commitmentId": commitment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -178,7 +177,7 @@ def get_commitment(self, commitment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def list_commitments(self, subscribed_service_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_commitments got unknown kwargs: {extra_kwargs!r}") @@ -306,14 +305,14 @@ def list_commitments(self, subscribed_service_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/computed_usage_client.py b/src/oci/onesubscription/computed_usage_client.py index d30b2e5103..0e5b89e2e6 100644 --- a/src/oci/onesubscription/computed_usage_client.py +++ b/src/oci/onesubscription/computed_usage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def get_computed_usage(self, computed_usage_id, compartment_id, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_computed_usage got unknown kwargs: {extra_kwargs!r}") @@ -177,24 +176,24 @@ def get_computed_usage(self, computed_usage_id, compartment_id, **kwargs): "computedUsageId": computed_usage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id, "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -301,7 +300,7 @@ def list_aggregated_computed_usages(self, compartment_id, subscription_id, time_ "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_aggregated_computed_usages got unknown kwargs: {extra_kwargs!r}") @@ -323,14 +322,14 @@ def list_aggregated_computed_usages(self, compartment_id, subscription_id, time_ "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -445,7 +444,7 @@ def list_computed_usages(self, compartment_id, subscription_id, time_from, time_ "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_computed_usages got unknown kwargs: {extra_kwargs!r}") @@ -476,14 +475,14 @@ def list_computed_usages(self, compartment_id, subscription_id, time_from, time_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/invoice_summary_client.py b/src/oci/onesubscription/invoice_summary_client.py index 6c3cee92ef..d84ab60c64 100644 --- a/src/oci/onesubscription/invoice_summary_client.py +++ b/src/oci/onesubscription/invoice_summary_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -190,7 +189,7 @@ def list_invoiceline_computed_usages(self, compartment_id, invoice_line_id, **kw "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_invoiceline_computed_usages got unknown kwargs: {extra_kwargs!r}") @@ -218,14 +217,14 @@ def list_invoiceline_computed_usages(self, compartment_id, invoice_line_id, **kw "page": kwargs.get("page", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -341,7 +340,7 @@ def list_invoices(self, compartment_id, ar_customer_transaction_id, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_invoices got unknown kwargs: {extra_kwargs!r}") @@ -371,14 +370,14 @@ def list_invoices(self, compartment_id, ar_customer_transaction_id, **kwargs): "page": kwargs.get("page", missing), "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/organization_subscription_client.py b/src/oci/onesubscription/organization_subscription_client.py index 89b6900755..6735126e00 100644 --- a/src/oci/onesubscription/organization_subscription_client.py +++ b/src/oci/onesubscription/organization_subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def list_organization_subscriptions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_organization_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -206,14 +205,14 @@ def list_organization_subscriptions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/ratecard_client.py b/src/oci/onesubscription/ratecard_client.py index 46b0fba65f..b458675acb 100644 --- a/src/oci/onesubscription/ratecard_client.py +++ b/src/oci/onesubscription/ratecard_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -196,7 +195,7 @@ def list_rate_cards(self, subscription_id, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rate_cards got unknown kwargs: {extra_kwargs!r}") @@ -226,14 +225,14 @@ def list_rate_cards(self, subscription_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/subscribed_service_client.py b/src/oci/onesubscription/subscribed_service_client.py index 86edbcacc7..8bb191c967 100644 --- a/src/oci/onesubscription/subscribed_service_client.py +++ b/src/oci/onesubscription/subscribed_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def get_subscribed_service(self, subscribed_service_id, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscribed_service got unknown kwargs: {extra_kwargs!r}") @@ -179,23 +178,23 @@ def get_subscribed_service(self, subscribed_service_id, **kwargs): "subscribedServiceId": subscribed_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -306,7 +305,7 @@ def list_subscribed_services(self, compartment_id, subscription_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscribed_services got unknown kwargs: {extra_kwargs!r}") @@ -335,14 +334,14 @@ def list_subscribed_services(self, compartment_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/onesubscription/subscription_client.py b/src/oci/onesubscription/subscription_client.py index 10059a9de2..4ff6015e56 100644 --- a/src/oci/onesubscription/subscription_client.py +++ b/src/oci/onesubscription/subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -199,7 +198,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -229,14 +228,14 @@ def list_subscriptions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ons/notification_control_plane_client.py b/src/oci/ons/notification_control_plane_client.py index 8dbd8b95ca..4e90bb12f6 100644 --- a/src/oci/ons/notification_control_plane_client.py +++ b/src/oci/ons/notification_control_plane_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -185,7 +184,7 @@ def change_topic_compartment(self, topic_id, change_topic_compartment_details, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_topic_compartment got unknown kwargs: {extra_kwargs!r}") @@ -194,10 +193,10 @@ def change_topic_compartment(self, topic_id, change_topic_compartment_details, * "topicId": topic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -207,7 +206,7 @@ def change_topic_compartment(self, topic_id, change_topic_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -310,7 +309,7 @@ def create_topic(self, create_topic_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_topic got unknown kwargs: {extra_kwargs!r}") @@ -321,7 +320,7 @@ def create_topic(self, create_topic_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -409,7 +408,7 @@ def delete_topic(self, topic_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_topic got unknown kwargs: {extra_kwargs!r}") @@ -418,10 +417,10 @@ def delete_topic(self, topic_id, **kwargs): "topicId": topic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -430,7 +429,7 @@ def delete_topic(self, topic_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -509,7 +508,7 @@ def get_topic(self, topic_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_topic got unknown kwargs: {extra_kwargs!r}") @@ -518,10 +517,10 @@ def get_topic(self, topic_id, **kwargs): "topicId": topic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -529,7 +528,7 @@ def get_topic(self, topic_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -650,7 +649,7 @@ def list_topics(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_topics got unknown kwargs: {extra_kwargs!r}") @@ -686,14 +685,14 @@ def list_topics(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -783,7 +782,7 @@ def update_topic(self, topic_id, topic_attributes_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_topic got unknown kwargs: {extra_kwargs!r}") @@ -792,10 +791,10 @@ def update_topic(self, topic_id, topic_attributes_details, **kwargs): "topicId": topic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -804,7 +803,7 @@ def update_topic(self, topic_id, topic_attributes_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/ons/notification_data_plane_client.py b/src/oci/ons/notification_data_plane_client.py index 10ba68c122..e3bc581960 100644 --- a/src/oci/ons/notification_data_plane_client.py +++ b/src/oci/ons/notification_data_plane_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -185,7 +184,7 @@ def change_subscription_compartment(self, subscription_id, change_subscription_c "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_subscription_compartment got unknown kwargs: {extra_kwargs!r}") @@ -194,10 +193,10 @@ def change_subscription_compartment(self, subscription_id, change_subscription_c "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -207,7 +206,7 @@ def change_subscription_compartment(self, subscription_id, change_subscription_c "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def create_subscription(self, create_subscription_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_subscription got unknown kwargs: {extra_kwargs!r}") @@ -310,7 +309,7 @@ def create_subscription(self, create_subscription_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -398,7 +397,7 @@ def delete_subscription(self, subscription_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_subscription got unknown kwargs: {extra_kwargs!r}") @@ -407,10 +406,10 @@ def delete_subscription(self, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -419,7 +418,7 @@ def delete_subscription(self, subscription_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -518,7 +517,7 @@ def get_confirm_subscription(self, id, token, protocol, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_confirm_subscription got unknown kwargs: {extra_kwargs!r}") @@ -527,24 +526,24 @@ def get_confirm_subscription(self, id, token, protocol, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "token": token, "protocol": protocol } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -627,7 +626,7 @@ def get_subscription(self, subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscription got unknown kwargs: {extra_kwargs!r}") @@ -636,10 +635,10 @@ def get_subscription(self, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -647,7 +646,7 @@ def get_subscription(self, subscription_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -748,7 +747,7 @@ def get_unsubscription(self, id, token, protocol, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_unsubscription got unknown kwargs: {extra_kwargs!r}") @@ -757,24 +756,24 @@ def get_unsubscription(self, id, token, protocol, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "token": token, "protocol": protocol } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -875,7 +874,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -886,14 +885,14 @@ def list_subscriptions(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1006,7 +1005,7 @@ def publish_message(self, topic_id, message_details, **kwargs): "opc_request_id", "message_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_message got unknown kwargs: {extra_kwargs!r}") @@ -1015,10 +1014,10 @@ def publish_message(self, topic_id, message_details, **kwargs): "topicId": topic_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1027,7 +1026,7 @@ def publish_message(self, topic_id, message_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "messageType": kwargs.get("message_type", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1110,7 +1109,7 @@ def resend_subscription_confirmation(self, id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resend_subscription_confirmation got unknown kwargs: {extra_kwargs!r}") @@ -1119,10 +1118,10 @@ def resend_subscription_confirmation(self, id, **kwargs): "id": id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1130,7 +1129,7 @@ def resend_subscription_confirmation(self, id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1220,7 +1219,7 @@ def update_subscription(self, subscription_id, update_subscription_details, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1229,10 +1228,10 @@ def update_subscription(self, subscription_id, update_subscription_details, **kw "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1241,7 +1240,7 @@ def update_subscription(self, subscription_id, update_subscription_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/opa/opa_instance_client.py b/src/oci/opa/opa_instance_client.py index 44be9b90bd..01ab8a3236 100644 --- a/src/oci/opa/opa_instance_client.py +++ b/src/oci/opa/opa_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -274,7 +273,7 @@ def change_opa_instance_compartment(self, opa_instance_id, change_opa_instance_c "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_opa_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -283,10 +282,10 @@ def change_opa_instance_compartment(self, opa_instance_id, change_opa_instance_c "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -295,7 +294,7 @@ def change_opa_instance_compartment(self, opa_instance_id, change_opa_instance_c "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -381,7 +380,7 @@ def create_opa_instance(self, create_opa_instance_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -392,7 +391,7 @@ def create_opa_instance(self, create_opa_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -477,7 +476,7 @@ def delete_opa_instance(self, opa_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -486,10 +485,10 @@ def delete_opa_instance(self, opa_instance_id, **kwargs): "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -498,7 +497,7 @@ def delete_opa_instance(self, opa_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -574,7 +573,7 @@ def get_opa_instance(self, opa_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -583,10 +582,10 @@ def get_opa_instance(self, opa_instance_id, **kwargs): "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -594,7 +593,7 @@ def get_opa_instance(self, opa_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -672,7 +671,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -681,10 +680,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -692,7 +691,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -805,7 +804,7 @@ def list_opa_instances(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opa_instances got unknown kwargs: {extra_kwargs!r}") @@ -841,14 +840,14 @@ def list_opa_instances(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -946,7 +945,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -955,10 +954,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -981,14 +980,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1088,7 +1087,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1097,10 +1096,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1123,14 +1122,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1245,7 +1244,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1281,14 +1280,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1374,7 +1373,7 @@ def start_opa_instance(self, opa_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -1383,10 +1382,10 @@ def start_opa_instance(self, opa_instance_id, **kwargs): "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1395,7 +1394,7 @@ def start_opa_instance(self, opa_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1479,7 +1478,7 @@ def stop_opa_instance(self, opa_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -1488,10 +1487,10 @@ def stop_opa_instance(self, opa_instance_id, **kwargs): "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1500,7 +1499,7 @@ def stop_opa_instance(self, opa_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1587,7 +1586,7 @@ def update_opa_instance(self, opa_instance_id, update_opa_instance_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_opa_instance got unknown kwargs: {extra_kwargs!r}") @@ -1596,10 +1595,10 @@ def update_opa_instance(self, opa_instance_id, update_opa_instance_details, **kw "opaInstanceId": opa_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1608,7 +1607,7 @@ def update_opa_instance(self, opa_instance_id, update_opa_instance_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/opensearch/opensearch_cluster_backup_client.py b/src/oci/opensearch/opensearch_cluster_backup_client.py index 45a96b9f1e..84d11f1e9d 100644 --- a/src/oci/opensearch/opensearch_cluster_backup_client.py +++ b/src/oci/opensearch/opensearch_cluster_backup_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def delete_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_opensearch_cluster_backup got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def delete_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwarg "opensearchClusterBackupId": opensearch_cluster_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def delete_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -261,7 +260,7 @@ def get_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_opensearch_cluster_backup got unknown kwargs: {extra_kwargs!r}") @@ -270,10 +269,10 @@ def get_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwargs): "opensearchClusterBackupId": opensearch_cluster_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -281,7 +280,7 @@ def get_opensearch_cluster_backup(self, opensearch_cluster_backup_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -395,7 +394,7 @@ def list_opensearch_cluster_backups(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opensearch_cluster_backups got unknown kwargs: {extra_kwargs!r}") @@ -432,14 +431,14 @@ def list_opensearch_cluster_backups(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -526,7 +525,7 @@ def update_opensearch_cluster_backup(self, opensearch_cluster_backup_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_opensearch_cluster_backup got unknown kwargs: {extra_kwargs!r}") @@ -535,10 +534,10 @@ def update_opensearch_cluster_backup(self, opensearch_cluster_backup_id, update_ "opensearchClusterBackupId": opensearch_cluster_backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -547,7 +546,7 @@ def update_opensearch_cluster_backup(self, opensearch_cluster_backup_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/opensearch/opensearch_cluster_client.py b/src/oci/opensearch/opensearch_cluster_client.py index 1ad77de423..040f040c81 100644 --- a/src/oci/opensearch/opensearch_cluster_client.py +++ b/src/oci/opensearch/opensearch_cluster_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def backup_opensearch_cluster(self, opensearch_cluster_id, backup_opensearch_clu "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"backup_opensearch_cluster got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def backup_opensearch_cluster(self, opensearch_cluster_id, backup_opensearch_clu "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def backup_opensearch_cluster(self, opensearch_cluster_id, backup_opensearch_clu "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -284,7 +283,7 @@ def create_opensearch_cluster(self, create_opensearch_cluster_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_opensearch_cluster got unknown kwargs: {extra_kwargs!r}") @@ -295,7 +294,7 @@ def create_opensearch_cluster(self, create_opensearch_cluster_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -378,7 +377,7 @@ def delete_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_opensearch_cluster got unknown kwargs: {extra_kwargs!r}") @@ -387,10 +386,10 @@ def delete_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -399,7 +398,7 @@ def delete_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -473,7 +472,7 @@ def get_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_opensearch_cluster got unknown kwargs: {extra_kwargs!r}") @@ -482,10 +481,10 @@ def get_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -493,7 +492,7 @@ def get_opensearch_cluster(self, opensearch_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -569,7 +568,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -578,10 +577,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -589,7 +588,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -699,7 +698,7 @@ def list_opensearch_clusters(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opensearch_clusters got unknown kwargs: {extra_kwargs!r}") @@ -735,14 +734,14 @@ def list_opensearch_clusters(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -822,7 +821,7 @@ def list_opensearch_versions(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opensearch_versions got unknown kwargs: {extra_kwargs!r}") @@ -832,7 +831,7 @@ def list_opensearch_versions(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -921,7 +920,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -930,24 +929,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1033,7 +1032,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1042,24 +1041,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1153,7 +1152,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1165,14 +1164,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1267,7 +1266,7 @@ def opensearch_cluster_restore(self, opensearch_cluster_id, restore_opensearch_c "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"opensearch_cluster_restore got unknown kwargs: {extra_kwargs!r}") @@ -1276,10 +1275,10 @@ def opensearch_cluster_restore(self, opensearch_cluster_id, restore_opensearch_c "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1289,7 +1288,7 @@ def opensearch_cluster_restore(self, opensearch_cluster_id, restore_opensearch_c "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1385,7 +1384,7 @@ def resize_opensearch_cluster_horizontal(self, opensearch_cluster_id, resize_ope "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resize_opensearch_cluster_horizontal got unknown kwargs: {extra_kwargs!r}") @@ -1394,10 +1393,10 @@ def resize_opensearch_cluster_horizontal(self, opensearch_cluster_id, resize_ope "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1407,7 +1406,7 @@ def resize_opensearch_cluster_horizontal(self, opensearch_cluster_id, resize_ope "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1503,7 +1502,7 @@ def resize_opensearch_cluster_vertical(self, opensearch_cluster_id, resize_opens "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resize_opensearch_cluster_vertical got unknown kwargs: {extra_kwargs!r}") @@ -1512,10 +1511,10 @@ def resize_opensearch_cluster_vertical(self, opensearch_cluster_id, resize_opens "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1525,7 +1524,7 @@ def resize_opensearch_cluster_vertical(self, opensearch_cluster_id, resize_opens "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1613,7 +1612,7 @@ def update_opensearch_cluster(self, opensearch_cluster_id, update_opensearch_clu "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_opensearch_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1622,10 +1621,10 @@ def update_opensearch_cluster(self, opensearch_cluster_id, update_opensearch_clu "opensearchClusterId": opensearch_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1634,7 +1633,7 @@ def update_opensearch_cluster(self, opensearch_cluster_id, update_opensearch_clu "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/operator_access_control/access_requests_client.py b/src/oci/operator_access_control/access_requests_client.py index 82a9076d99..806e1607b0 100644 --- a/src/oci/operator_access_control/access_requests_client.py +++ b/src/oci/operator_access_control/access_requests_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def approve_access_request(self, access_request_id, approve_access_request_detai "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"approve_access_request got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def approve_access_request(self, access_request_id, approve_access_request_detai "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def approve_access_request(self, access_request_id, approve_access_request_detai "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def get_access_request(self, access_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_access_request got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def get_access_request(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -301,7 +300,7 @@ def get_access_request(self, access_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def get_audit_log_report(self, access_request_id, **kwargs): "enable_process_tree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_audit_log_report got unknown kwargs: {extra_kwargs!r}") @@ -392,23 +391,23 @@ def get_audit_log_report(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "enableProcessTree": kwargs.get("enable_process_tree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -507,7 +506,7 @@ def interaction_request(self, access_request_id, interaction_request_details, ** "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"interaction_request got unknown kwargs: {extra_kwargs!r}") @@ -516,10 +515,10 @@ def interaction_request(self, access_request_id, interaction_request_details, ** "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -529,7 +528,7 @@ def interaction_request(self, access_request_id, interaction_request_details, ** "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def list_access_request_histories(self, access_request_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_access_request_histories got unknown kwargs: {extra_kwargs!r}") @@ -627,24 +626,24 @@ def list_access_request_histories(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -770,7 +769,7 @@ def list_access_requests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_access_requests got unknown kwargs: {extra_kwargs!r}") @@ -808,14 +807,14 @@ def list_access_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -901,7 +900,7 @@ def list_interactions(self, access_request_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_interactions got unknown kwargs: {extra_kwargs!r}") @@ -910,24 +909,24 @@ def list_interactions(self, access_request_id, **kwargs): "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1026,7 +1025,7 @@ def reject_access_request(self, access_request_id, reject_access_request_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reject_access_request got unknown kwargs: {extra_kwargs!r}") @@ -1035,10 +1034,10 @@ def reject_access_request(self, access_request_id, reject_access_request_details "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1048,7 +1047,7 @@ def reject_access_request(self, access_request_id, reject_access_request_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1146,7 +1145,7 @@ def review_access_request(self, access_request_id, review_access_request_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"review_access_request got unknown kwargs: {extra_kwargs!r}") @@ -1155,10 +1154,10 @@ def review_access_request(self, access_request_id, review_access_request_details "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1168,7 +1167,7 @@ def review_access_request(self, access_request_id, review_access_request_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1268,7 +1267,7 @@ def revoke_access_request(self, access_request_id, revoke_access_request_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"revoke_access_request got unknown kwargs: {extra_kwargs!r}") @@ -1277,10 +1276,10 @@ def revoke_access_request(self, access_request_id, revoke_access_request_details "accessRequestId": access_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1290,7 +1289,7 @@ def revoke_access_request(self, access_request_id, revoke_access_request_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/operator_access_control/operator_actions_client.py b/src/oci/operator_access_control/operator_actions_client.py index 2b59b7e059..095a3ab7ed 100644 --- a/src/oci/operator_access_control/operator_actions_client.py +++ b/src/oci/operator_access_control/operator_actions_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -161,7 +160,7 @@ def get_operator_action(self, operator_action_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operator_action got unknown kwargs: {extra_kwargs!r}") @@ -170,10 +169,10 @@ def get_operator_action(self, operator_action_id, **kwargs): "operatorActionId": operator_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -181,7 +180,7 @@ def get_operator_action(self, operator_action_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -293,7 +292,7 @@ def list_operator_actions(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operator_actions got unknown kwargs: {extra_kwargs!r}") @@ -329,14 +328,14 @@ def list_operator_actions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/operator_access_control/operator_control_assignment_client.py b/src/oci/operator_access_control/operator_control_assignment_client.py index d4ae9efa12..690175b65b 100644 --- a/src/oci/operator_access_control/operator_control_assignment_client.py +++ b/src/oci/operator_access_control/operator_control_assignment_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def change_operator_control_assignment_compartment(self, operator_control_assign "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_operator_control_assignment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def change_operator_control_assignment_compartment(self, operator_control_assign "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def change_operator_control_assignment_compartment(self, operator_control_assign "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def create_operator_control_assignment(self, create_operator_control_assignment_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_operator_control_assignment got unknown kwargs: {extra_kwargs!r}") @@ -300,7 +299,7 @@ def create_operator_control_assignment(self, create_operator_control_assignment_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -391,7 +390,7 @@ def delete_operator_control_assignment(self, operator_control_assignment_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_operator_control_assignment got unknown kwargs: {extra_kwargs!r}") @@ -400,16 +399,16 @@ def delete_operator_control_assignment(self, operator_control_assignment_id, **k "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "description": kwargs.get("description", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -417,7 +416,7 @@ def delete_operator_control_assignment(self, operator_control_assignment_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -495,7 +494,7 @@ def get_assignment_validation_status(self, operator_control_assignment_id, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_assignment_validation_status got unknown kwargs: {extra_kwargs!r}") @@ -504,10 +503,10 @@ def get_assignment_validation_status(self, operator_control_assignment_id, **kwa "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -515,7 +514,7 @@ def get_assignment_validation_status(self, operator_control_assignment_id, **kwa "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -593,7 +592,7 @@ def get_operator_control_assignment(self, operator_control_assignment_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operator_control_assignment got unknown kwargs: {extra_kwargs!r}") @@ -602,10 +601,10 @@ def get_operator_control_assignment(self, operator_control_assignment_id, **kwar "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -613,7 +612,7 @@ def get_operator_control_assignment(self, operator_control_assignment_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -729,7 +728,7 @@ def list_operator_control_assignments(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operator_control_assignments got unknown kwargs: {extra_kwargs!r}") @@ -766,14 +765,14 @@ def list_operator_control_assignments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -862,7 +861,7 @@ def update_operator_control_assignment(self, operator_control_assignment_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_operator_control_assignment got unknown kwargs: {extra_kwargs!r}") @@ -871,10 +870,10 @@ def update_operator_control_assignment(self, operator_control_assignment_id, upd "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -883,7 +882,7 @@ def update_operator_control_assignment(self, operator_control_assignment_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -982,7 +981,7 @@ def validate_operator_assignment(self, operator_control_assignment_id, validate_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"validate_operator_assignment got unknown kwargs: {extra_kwargs!r}") @@ -991,10 +990,10 @@ def validate_operator_assignment(self, operator_control_assignment_id, validate_ "operatorControlAssignmentId": operator_control_assignment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1004,7 +1003,7 @@ def validate_operator_assignment(self, operator_control_assignment_id, validate_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/operator_access_control/operator_control_client.py b/src/oci/operator_access_control/operator_control_client.py index 3d9d68ebe4..814dcfff73 100644 --- a/src/oci/operator_access_control/operator_control_client.py +++ b/src/oci/operator_access_control/operator_control_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def change_operator_control_compartment(self, operator_control_id, change_operat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_operator_control_compartment got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def change_operator_control_compartment(self, operator_control_id, change_operat "operatorControlId": operator_control_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def change_operator_control_compartment(self, operator_control_id, change_operat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -289,7 +288,7 @@ def create_operator_control(self, create_operator_control_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_operator_control got unknown kwargs: {extra_kwargs!r}") @@ -300,7 +299,7 @@ def create_operator_control(self, create_operator_control_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -395,7 +394,7 @@ def delete_operator_control(self, operator_control_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_operator_control got unknown kwargs: {extra_kwargs!r}") @@ -404,16 +403,16 @@ def delete_operator_control(self, operator_control_id, **kwargs): "operatorControlId": operator_control_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "description": kwargs.get("description", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -421,7 +420,7 @@ def delete_operator_control(self, operator_control_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -499,7 +498,7 @@ def get_operator_control(self, operator_control_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operator_control got unknown kwargs: {extra_kwargs!r}") @@ -508,10 +507,10 @@ def get_operator_control(self, operator_control_id, **kwargs): "operatorControlId": operator_control_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -519,7 +518,7 @@ def get_operator_control(self, operator_control_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -631,7 +630,7 @@ def list_operator_controls(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operator_controls got unknown kwargs: {extra_kwargs!r}") @@ -667,14 +666,14 @@ def list_operator_controls(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -763,7 +762,7 @@ def update_operator_control(self, operator_control_id, update_operator_control_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_operator_control got unknown kwargs: {extra_kwargs!r}") @@ -772,10 +771,10 @@ def update_operator_control(self, operator_control_id, update_operator_control_d "operatorControlId": operator_control_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -784,7 +783,7 @@ def update_operator_control(self, operator_control_id, update_operator_control_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/opsi/operations_insights_client.py b/src/oci/opsi/operations_insights_client.py index ab065e5347..d8cf4a90cd 100644 --- a/src/oci/opsi/operations_insights_client.py +++ b/src/oci/opsi/operations_insights_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def add_exadata_insight_members(self, add_exadata_insight_members_details, exada "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_exadata_insight_members got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def add_exadata_insight_members(self, add_exadata_insight_members_details, exada "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def add_exadata_insight_members(self, add_exadata_insight_members_details, exada "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -300,7 +299,7 @@ def change_autonomous_database_insight_advanced_features(self, change_autonomous "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_autonomous_database_insight_advanced_features got unknown kwargs: {extra_kwargs!r}") @@ -309,10 +308,10 @@ def change_autonomous_database_insight_advanced_features(self, change_autonomous "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -322,7 +321,7 @@ def change_autonomous_database_insight_advanced_features(self, change_autonomous "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -420,7 +419,7 @@ def change_awr_hub_source_compartment(self, awr_hub_source_id, change_awr_hub_so "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_awr_hub_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -429,10 +428,10 @@ def change_awr_hub_source_compartment(self, awr_hub_source_id, change_awr_hub_so "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -442,7 +441,7 @@ def change_awr_hub_source_compartment(self, awr_hub_source_id, change_awr_hub_so "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -540,7 +539,7 @@ def change_database_insight_compartment(self, database_insight_id, change_databa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_database_insight_compartment got unknown kwargs: {extra_kwargs!r}") @@ -549,10 +548,10 @@ def change_database_insight_compartment(self, database_insight_id, change_databa "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -562,7 +561,7 @@ def change_database_insight_compartment(self, database_insight_id, change_databa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -651,7 +650,7 @@ def change_enterprise_manager_bridge_compartment(self, enterprise_manager_bridge "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_enterprise_manager_bridge_compartment got unknown kwargs: {extra_kwargs!r}") @@ -660,10 +659,10 @@ def change_enterprise_manager_bridge_compartment(self, enterprise_manager_bridge "enterpriseManagerBridgeId": enterprise_manager_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -672,7 +671,7 @@ def change_enterprise_manager_bridge_compartment(self, enterprise_manager_bridge "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -769,7 +768,7 @@ def change_exadata_insight_compartment(self, exadata_insight_id, change_exadata_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_exadata_insight_compartment got unknown kwargs: {extra_kwargs!r}") @@ -778,10 +777,10 @@ def change_exadata_insight_compartment(self, exadata_insight_id, change_exadata_ "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -791,7 +790,7 @@ def change_exadata_insight_compartment(self, exadata_insight_id, change_exadata_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -889,7 +888,7 @@ def change_host_insight_compartment(self, host_insight_id, change_host_insight_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_insight_compartment got unknown kwargs: {extra_kwargs!r}") @@ -898,10 +897,10 @@ def change_host_insight_compartment(self, host_insight_id, change_host_insight_c "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -911,7 +910,7 @@ def change_host_insight_compartment(self, host_insight_id, change_host_insight_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1009,7 +1008,7 @@ def change_news_report_compartment(self, news_report_id, change_news_report_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_news_report_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1018,10 +1017,10 @@ def change_news_report_compartment(self, news_report_id, change_news_report_comp "newsReportId": news_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1031,7 +1030,7 @@ def change_news_report_compartment(self, news_report_id, change_news_report_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1131,7 +1130,7 @@ def change_operations_insights_private_endpoint_compartment(self, operations_ins "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_operations_insights_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1140,10 +1139,10 @@ def change_operations_insights_private_endpoint_compartment(self, operations_ins "operationsInsightsPrivateEndpointId": operations_insights_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1153,7 +1152,7 @@ def change_operations_insights_private_endpoint_compartment(self, operations_ins "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1251,7 +1250,7 @@ def change_operations_insights_warehouse_compartment(self, operations_insights_w "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_operations_insights_warehouse_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1260,10 +1259,10 @@ def change_operations_insights_warehouse_compartment(self, operations_insights_w "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1273,7 +1272,7 @@ def change_operations_insights_warehouse_compartment(self, operations_insights_w "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1373,7 +1372,7 @@ def change_opsi_configuration_compartment(self, opsi_configuration_id, change_op "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_opsi_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1382,10 +1381,10 @@ def change_opsi_configuration_compartment(self, opsi_configuration_id, change_op "opsiConfigurationId": opsi_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1395,7 +1394,7 @@ def change_opsi_configuration_compartment(self, opsi_configuration_id, change_op "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1493,7 +1492,7 @@ def change_pe_comanaged_database_insight(self, database_insight_id, change_pe_co "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_pe_comanaged_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -1502,10 +1501,10 @@ def change_pe_comanaged_database_insight(self, database_insight_id, change_pe_co "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1515,7 +1514,7 @@ def change_pe_comanaged_database_insight(self, database_insight_id, change_pe_co "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1605,7 +1604,7 @@ def create_awr_hub(self, create_awr_hub_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_awr_hub got unknown kwargs: {extra_kwargs!r}") @@ -1616,7 +1615,7 @@ def create_awr_hub(self, create_awr_hub_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1705,7 +1704,7 @@ def create_awr_hub_source(self, create_awr_hub_source_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -1716,7 +1715,7 @@ def create_awr_hub_source(self, create_awr_hub_source_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1805,7 +1804,7 @@ def create_database_insight(self, create_database_insight_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -1816,7 +1815,7 @@ def create_database_insight(self, create_database_insight_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1905,7 +1904,7 @@ def create_enterprise_manager_bridge(self, create_enterprise_manager_bridge_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_enterprise_manager_bridge got unknown kwargs: {extra_kwargs!r}") @@ -1916,7 +1915,7 @@ def create_enterprise_manager_bridge(self, create_enterprise_manager_bridge_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2005,7 +2004,7 @@ def create_exadata_insight(self, create_exadata_insight_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -2016,7 +2015,7 @@ def create_exadata_insight(self, create_exadata_insight_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2105,7 +2104,7 @@ def create_host_insight(self, create_host_insight_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -2116,7 +2115,7 @@ def create_host_insight(self, create_host_insight_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2205,7 +2204,7 @@ def create_news_report(self, create_news_report_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_news_report got unknown kwargs: {extra_kwargs!r}") @@ -2216,7 +2215,7 @@ def create_news_report(self, create_news_report_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2306,7 +2305,7 @@ def create_operations_insights_private_endpoint(self, create_operations_insights "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_operations_insights_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2317,7 +2316,7 @@ def create_operations_insights_private_endpoint(self, create_operations_insights "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2408,7 +2407,7 @@ def create_operations_insights_warehouse(self, create_operations_insights_wareho "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_operations_insights_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -2419,7 +2418,7 @@ def create_operations_insights_warehouse(self, create_operations_insights_wareho "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2509,7 +2508,7 @@ def create_operations_insights_warehouse_user(self, create_operations_insights_w "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_operations_insights_warehouse_user got unknown kwargs: {extra_kwargs!r}") @@ -2520,7 +2519,7 @@ def create_operations_insights_warehouse_user(self, create_operations_insights_w "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2632,7 +2631,7 @@ def create_opsi_configuration(self, create_opsi_configuration_details, **kwargs) "config_items_applicable_context", "config_item_field" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_opsi_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2667,7 +2666,7 @@ def create_opsi_configuration(self, create_opsi_configuration_details, **kwargs) "configItemsApplicableContext": self.base_client.generate_collection_format_param(kwargs.get("config_items_applicable_context", missing), 'multi'), "configItemField": self.base_client.generate_collection_format_param(kwargs.get("config_item_field", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2675,7 +2674,7 @@ def create_opsi_configuration(self, create_opsi_configuration_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2763,7 +2762,7 @@ def delete_awr_hub(self, awr_hub_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_awr_hub got unknown kwargs: {extra_kwargs!r}") @@ -2772,10 +2771,10 @@ def delete_awr_hub(self, awr_hub_id, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2784,7 +2783,7 @@ def delete_awr_hub(self, awr_hub_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2870,7 +2869,7 @@ def delete_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_awr_hub_object got unknown kwargs: {extra_kwargs!r}") @@ -2880,10 +2879,10 @@ def delete_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2892,7 +2891,7 @@ def delete_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2975,7 +2974,7 @@ def delete_awr_hub_source(self, awr_hub_source_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -2984,10 +2983,10 @@ def delete_awr_hub_source(self, awr_hub_source_id, **kwargs): "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2996,7 +2995,7 @@ def delete_awr_hub_source(self, awr_hub_source_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3079,7 +3078,7 @@ def delete_database_insight(self, database_insight_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -3088,10 +3087,10 @@ def delete_database_insight(self, database_insight_id, **kwargs): "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3100,7 +3099,7 @@ def delete_database_insight(self, database_insight_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3183,7 +3182,7 @@ def delete_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_enterprise_manager_bridge got unknown kwargs: {extra_kwargs!r}") @@ -3192,10 +3191,10 @@ def delete_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwarg "enterpriseManagerBridgeId": enterprise_manager_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3204,7 +3203,7 @@ def delete_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3287,7 +3286,7 @@ def delete_exadata_insight(self, exadata_insight_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -3296,10 +3295,10 @@ def delete_exadata_insight(self, exadata_insight_id, **kwargs): "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3308,7 +3307,7 @@ def delete_exadata_insight(self, exadata_insight_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3391,7 +3390,7 @@ def delete_host_insight(self, host_insight_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -3400,10 +3399,10 @@ def delete_host_insight(self, host_insight_id, **kwargs): "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3412,7 +3411,7 @@ def delete_host_insight(self, host_insight_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3495,7 +3494,7 @@ def delete_news_report(self, news_report_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_news_report got unknown kwargs: {extra_kwargs!r}") @@ -3504,10 +3503,10 @@ def delete_news_report(self, news_report_id, **kwargs): "newsReportId": news_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3516,7 +3515,7 @@ def delete_news_report(self, news_report_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3601,7 +3600,7 @@ def delete_operations_insights_private_endpoint(self, operations_insights_privat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_operations_insights_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3610,10 +3609,10 @@ def delete_operations_insights_private_endpoint(self, operations_insights_privat "operationsInsightsPrivateEndpointId": operations_insights_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3622,7 +3621,7 @@ def delete_operations_insights_private_endpoint(self, operations_insights_privat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3708,7 +3707,7 @@ def delete_operations_insights_warehouse(self, operations_insights_warehouse_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_operations_insights_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -3717,10 +3716,10 @@ def delete_operations_insights_warehouse(self, operations_insights_warehouse_id, "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3729,7 +3728,7 @@ def delete_operations_insights_warehouse(self, operations_insights_warehouse_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3812,7 +3811,7 @@ def delete_operations_insights_warehouse_user(self, operations_insights_warehous "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_operations_insights_warehouse_user got unknown kwargs: {extra_kwargs!r}") @@ -3821,10 +3820,10 @@ def delete_operations_insights_warehouse_user(self, operations_insights_warehous "operationsInsightsWarehouseUserId": operations_insights_warehouse_user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3833,7 +3832,7 @@ def delete_operations_insights_warehouse_user(self, operations_insights_warehous "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3918,7 +3917,7 @@ def delete_opsi_configuration(self, opsi_configuration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_opsi_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3927,10 +3926,10 @@ def delete_opsi_configuration(self, opsi_configuration_id, **kwargs): "opsiConfigurationId": opsi_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3939,7 +3938,7 @@ def delete_opsi_configuration(self, opsi_configuration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4031,7 +4030,7 @@ def disable_autonomous_database_insight_advanced_features(self, database_insight "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_autonomous_database_insight_advanced_features got unknown kwargs: {extra_kwargs!r}") @@ -4040,10 +4039,10 @@ def disable_autonomous_database_insight_advanced_features(self, database_insight "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4053,7 +4052,7 @@ def disable_autonomous_database_insight_advanced_features(self, database_insight "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4146,7 +4145,7 @@ def disable_awr_hub_source(self, awr_hub_source_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -4155,10 +4154,10 @@ def disable_awr_hub_source(self, awr_hub_source_id, **kwargs): "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4168,7 +4167,7 @@ def disable_awr_hub_source(self, awr_hub_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4261,7 +4260,7 @@ def disable_database_insight(self, database_insight_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -4270,10 +4269,10 @@ def disable_database_insight(self, database_insight_id, **kwargs): "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4283,7 +4282,7 @@ def disable_database_insight(self, database_insight_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4376,7 +4375,7 @@ def disable_exadata_insight(self, exadata_insight_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -4385,10 +4384,10 @@ def disable_exadata_insight(self, exadata_insight_id, **kwargs): "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4398,7 +4397,7 @@ def disable_exadata_insight(self, exadata_insight_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4491,7 +4490,7 @@ def disable_host_insight(self, host_insight_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -4500,10 +4499,10 @@ def disable_host_insight(self, host_insight_id, **kwargs): "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4513,7 +4512,7 @@ def disable_host_insight(self, host_insight_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4603,7 +4602,7 @@ def download_operations_insights_warehouse_wallet(self, operations_insights_ware "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_operations_insights_warehouse_wallet got unknown kwargs: {extra_kwargs!r}") @@ -4612,10 +4611,10 @@ def download_operations_insights_warehouse_wallet(self, operations_insights_ware "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4624,7 +4623,7 @@ def download_operations_insights_warehouse_wallet(self, operations_insights_ware "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4724,7 +4723,7 @@ def enable_autonomous_database_insight_advanced_features(self, enable_autonomous "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_autonomous_database_insight_advanced_features got unknown kwargs: {extra_kwargs!r}") @@ -4733,10 +4732,10 @@ def enable_autonomous_database_insight_advanced_features(self, enable_autonomous "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4746,7 +4745,7 @@ def enable_autonomous_database_insight_advanced_features(self, enable_autonomous "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4841,7 +4840,7 @@ def enable_awr_hub_source(self, awr_hub_source_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -4850,10 +4849,10 @@ def enable_awr_hub_source(self, awr_hub_source_id, **kwargs): "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4863,7 +4862,7 @@ def enable_awr_hub_source(self, awr_hub_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4959,7 +4958,7 @@ def enable_database_insight(self, enable_database_insight_details, database_insi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -4968,10 +4967,10 @@ def enable_database_insight(self, enable_database_insight_details, database_insi "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4981,7 +4980,7 @@ def enable_database_insight(self, enable_database_insight_details, database_insi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5079,7 +5078,7 @@ def enable_exadata_insight(self, enable_exadata_insight_details, exadata_insight "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -5088,10 +5087,10 @@ def enable_exadata_insight(self, enable_exadata_insight_details, exadata_insight "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5101,7 +5100,7 @@ def enable_exadata_insight(self, enable_exadata_insight_details, exadata_insight "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5199,7 +5198,7 @@ def enable_host_insight(self, enable_host_insight_details, host_insight_id, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -5208,10 +5207,10 @@ def enable_host_insight(self, enable_host_insight_details, host_insight_id, **kw "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5221,7 +5220,7 @@ def enable_host_insight(self, enable_host_insight_details, host_insight_id, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5340,7 +5339,7 @@ def get_awr_database_report(self, awr_hub_id, awr_source_database_identifier, ** "report_format", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_database_report got unknown kwargs: {extra_kwargs!r}") @@ -5349,10 +5348,10 @@ def get_awr_database_report(self, awr_hub_id, awr_source_database_identifier, ** "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'report_type' in kwargs: @@ -5379,14 +5378,14 @@ def get_awr_database_report(self, awr_hub_id, awr_source_database_identifier, ** "reportType": kwargs.get("report_type", missing), "reportFormat": kwargs.get("report_format", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5503,7 +5502,7 @@ def get_awr_database_sql_report(self, awr_hub_id, awr_source_database_identifier "report_format", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_database_sql_report got unknown kwargs: {extra_kwargs!r}") @@ -5512,10 +5511,10 @@ def get_awr_database_sql_report(self, awr_hub_id, awr_source_database_identifier "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'report_format' in kwargs: @@ -5535,14 +5534,14 @@ def get_awr_database_sql_report(self, awr_hub_id, awr_source_database_identifier "sqlId": sql_id, "reportFormat": kwargs.get("report_format", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5623,7 +5622,7 @@ def get_awr_hub(self, awr_hub_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_hub got unknown kwargs: {extra_kwargs!r}") @@ -5632,10 +5631,10 @@ def get_awr_hub(self, awr_hub_id, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5643,7 +5642,7 @@ def get_awr_hub(self, awr_hub_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5725,7 +5724,7 @@ def get_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_hub_object got unknown kwargs: {extra_kwargs!r}") @@ -5735,10 +5734,10 @@ def get_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5746,7 +5745,7 @@ def get_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5825,7 +5824,7 @@ def get_awr_hub_source(self, awr_hub_source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -5834,10 +5833,10 @@ def get_awr_hub_source(self, awr_hub_source_id, **kwargs): "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5845,7 +5844,7 @@ def get_awr_hub_source(self, awr_hub_source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5954,7 +5953,7 @@ def get_awr_report(self, awr_hub_id, awr_source_database_identifier, **kwargs): "time_less_than_or_equal_to", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_awr_report got unknown kwargs: {extra_kwargs!r}") @@ -5963,10 +5962,10 @@ def get_awr_report(self, awr_hub_id, awr_source_database_identifier, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'report_format' in kwargs: @@ -5985,14 +5984,14 @@ def get_awr_report(self, awr_hub_id, awr_source_database_identifier, **kwargs): "timeGreaterThanOrEqualTo": kwargs.get("time_greater_than_or_equal_to", missing), "timeLessThanOrEqualTo": kwargs.get("time_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6073,7 +6072,7 @@ def get_database_insight(self, database_insight_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -6082,10 +6081,10 @@ def get_database_insight(self, database_insight_id, **kwargs): "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6093,7 +6092,7 @@ def get_database_insight(self, database_insight_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6172,7 +6171,7 @@ def get_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_enterprise_manager_bridge got unknown kwargs: {extra_kwargs!r}") @@ -6181,10 +6180,10 @@ def get_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwargs): "enterpriseManagerBridgeId": enterprise_manager_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6192,7 +6191,7 @@ def get_enterprise_manager_bridge(self, enterprise_manager_bridge_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6271,7 +6270,7 @@ def get_exadata_insight(self, exadata_insight_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -6280,10 +6279,10 @@ def get_exadata_insight(self, exadata_insight_id, **kwargs): "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6291,7 +6290,7 @@ def get_exadata_insight(self, exadata_insight_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6370,7 +6369,7 @@ def get_host_insight(self, host_insight_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -6379,10 +6378,10 @@ def get_host_insight(self, host_insight_id, **kwargs): "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6390,7 +6389,7 @@ def get_host_insight(self, host_insight_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6469,7 +6468,7 @@ def get_news_report(self, news_report_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_news_report got unknown kwargs: {extra_kwargs!r}") @@ -6478,10 +6477,10 @@ def get_news_report(self, news_report_id, **kwargs): "newsReportId": news_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6489,7 +6488,7 @@ def get_news_report(self, news_report_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6570,7 +6569,7 @@ def get_operations_insights_private_endpoint(self, operations_insights_private_e "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operations_insights_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6579,10 +6578,10 @@ def get_operations_insights_private_endpoint(self, operations_insights_private_e "operationsInsightsPrivateEndpointId": operations_insights_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6590,7 +6589,7 @@ def get_operations_insights_private_endpoint(self, operations_insights_private_e "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6670,7 +6669,7 @@ def get_operations_insights_warehouse(self, operations_insights_warehouse_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operations_insights_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -6679,10 +6678,10 @@ def get_operations_insights_warehouse(self, operations_insights_warehouse_id, ** "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6690,7 +6689,7 @@ def get_operations_insights_warehouse(self, operations_insights_warehouse_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6769,7 +6768,7 @@ def get_operations_insights_warehouse_user(self, operations_insights_warehouse_u "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_operations_insights_warehouse_user got unknown kwargs: {extra_kwargs!r}") @@ -6778,10 +6777,10 @@ def get_operations_insights_warehouse_user(self, operations_insights_warehouse_u "operationsInsightsWarehouseUserId": operations_insights_warehouse_user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6789,7 +6788,7 @@ def get_operations_insights_warehouse_user(self, operations_insights_warehouse_u "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6895,7 +6894,7 @@ def get_opsi_configuration(self, opsi_configuration_id, **kwargs): "config_item_field", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_opsi_configuration got unknown kwargs: {extra_kwargs!r}") @@ -6904,10 +6903,10 @@ def get_opsi_configuration(self, opsi_configuration_id, **kwargs): "opsiConfigurationId": opsi_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'opsi_config_field' in kwargs: @@ -6940,14 +6939,14 @@ def get_opsi_configuration(self, opsi_configuration_id, **kwargs): "configItemsApplicableContext": self.base_client.generate_collection_format_param(kwargs.get("config_items_applicable_context", missing), 'multi'), "configItemField": self.base_client.generate_collection_format_param(kwargs.get("config_item_field", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7033,7 +7032,7 @@ def get_opsi_data_object(self, compartment_id, opsi_data_object_identifier, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_opsi_data_object got unknown kwargs: {extra_kwargs!r}") @@ -7042,23 +7041,23 @@ def get_opsi_data_object(self, compartment_id, opsi_data_object_identifier, **kw "opsiDataObjectIdentifier": opsi_data_object_identifier } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7139,7 +7138,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -7148,10 +7147,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7159,7 +7158,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7241,7 +7240,7 @@ def head_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"head_awr_hub_object got unknown kwargs: {extra_kwargs!r}") @@ -7251,10 +7250,10 @@ def head_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7262,7 +7261,7 @@ def head_awr_hub_object(self, awr_hub_source_id, object_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7367,7 +7366,7 @@ def ingest_addm_reports(self, ingest_addm_reports_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_addm_reports got unknown kwargs: {extra_kwargs!r}") @@ -7376,7 +7375,7 @@ def ingest_addm_reports(self, ingest_addm_reports_details, **kwargs): "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7385,7 +7384,7 @@ def ingest_addm_reports(self, ingest_addm_reports_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7494,7 +7493,7 @@ def ingest_database_configuration(self, ingest_database_configuration_details, * "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_database_configuration got unknown kwargs: {extra_kwargs!r}") @@ -7503,7 +7502,7 @@ def ingest_database_configuration(self, ingest_database_configuration_details, * "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7512,7 +7511,7 @@ def ingest_database_configuration(self, ingest_database_configuration_details, * "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7614,7 +7613,7 @@ def ingest_host_configuration(self, id, ingest_host_configuration_details, **kwa "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_host_configuration got unknown kwargs: {extra_kwargs!r}") @@ -7622,7 +7621,7 @@ def ingest_host_configuration(self, id, ingest_host_configuration_details, **kwa query_params = { "id": id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7631,7 +7630,7 @@ def ingest_host_configuration(self, id, ingest_host_configuration_details, **kwa "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7733,7 +7732,7 @@ def ingest_host_metrics(self, id, ingest_host_metrics_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_host_metrics got unknown kwargs: {extra_kwargs!r}") @@ -7741,7 +7740,7 @@ def ingest_host_metrics(self, id, ingest_host_metrics_details, **kwargs): query_params = { "id": id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7750,7 +7749,7 @@ def ingest_host_metrics(self, id, ingest_host_metrics_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7866,7 +7865,7 @@ def ingest_sql_bucket(self, ingest_sql_bucket_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_sql_bucket got unknown kwargs: {extra_kwargs!r}") @@ -7876,7 +7875,7 @@ def ingest_sql_bucket(self, ingest_sql_bucket_details, **kwargs): "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7885,7 +7884,7 @@ def ingest_sql_bucket(self, ingest_sql_bucket_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8001,7 +8000,7 @@ def ingest_sql_plan_lines(self, ingest_sql_plan_lines_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_sql_plan_lines got unknown kwargs: {extra_kwargs!r}") @@ -8011,7 +8010,7 @@ def ingest_sql_plan_lines(self, ingest_sql_plan_lines_details, **kwargs): "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8020,7 +8019,7 @@ def ingest_sql_plan_lines(self, ingest_sql_plan_lines_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8130,7 +8129,7 @@ def ingest_sql_stats(self, ingest_sql_stats_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_sql_stats got unknown kwargs: {extra_kwargs!r}") @@ -8139,7 +8138,7 @@ def ingest_sql_stats(self, ingest_sql_stats_details, **kwargs): "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8148,7 +8147,7 @@ def ingest_sql_stats(self, ingest_sql_stats_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8265,7 +8264,7 @@ def ingest_sql_text(self, ingest_sql_text_details, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ingest_sql_text got unknown kwargs: {extra_kwargs!r}") @@ -8275,7 +8274,7 @@ def ingest_sql_text(self, ingest_sql_text_details, **kwargs): "databaseId": kwargs.get("database_id", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8284,7 +8283,7 @@ def ingest_sql_text(self, ingest_sql_text_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8443,7 +8442,7 @@ def list_addm_db_finding_categories(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_db_finding_categories got unknown kwargs: {extra_kwargs!r}") @@ -8476,14 +8475,14 @@ def list_addm_db_finding_categories(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8662,7 +8661,7 @@ def list_addm_db_findings_time_series(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_db_findings_time_series got unknown kwargs: {extra_kwargs!r}") @@ -8699,14 +8698,14 @@ def list_addm_db_findings_time_series(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8862,7 +8861,7 @@ def list_addm_db_parameter_categories(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_db_parameter_categories got unknown kwargs: {extra_kwargs!r}") @@ -8895,14 +8894,14 @@ def list_addm_db_parameter_categories(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9058,7 +9057,7 @@ def list_addm_db_recommendation_categories(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_db_recommendation_categories got unknown kwargs: {extra_kwargs!r}") @@ -9091,14 +9090,14 @@ def list_addm_db_recommendation_categories(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9297,7 +9296,7 @@ def list_addm_db_recommendations_time_series(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_db_recommendations_time_series got unknown kwargs: {extra_kwargs!r}") @@ -9338,14 +9337,14 @@ def list_addm_db_recommendations_time_series(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9516,7 +9515,7 @@ def list_addm_dbs(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_addm_dbs got unknown kwargs: {extra_kwargs!r}") @@ -9551,14 +9550,14 @@ def list_addm_dbs(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9694,7 +9693,7 @@ def list_awr_database_snapshots(self, awr_hub_id, awr_source_database_identifier "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_database_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -9703,10 +9702,10 @@ def list_awr_database_snapshots(self, awr_hub_id, awr_source_database_identifier "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -9735,14 +9734,14 @@ def list_awr_database_snapshots(self, awr_hub_id, awr_source_database_identifier "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9865,7 +9864,7 @@ def list_awr_databases(self, awr_hub_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_databases got unknown kwargs: {extra_kwargs!r}") @@ -9874,10 +9873,10 @@ def list_awr_databases(self, awr_hub_id, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -9903,14 +9902,14 @@ def list_awr_databases(self, awr_hub_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10042,7 +10041,7 @@ def list_awr_hub_objects(self, awr_hub_source_id, **kwargs): "fields", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_hub_objects got unknown kwargs: {extra_kwargs!r}") @@ -10051,10 +10050,10 @@ def list_awr_hub_objects(self, awr_hub_source_id, **kwargs): "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'fields' in kwargs: @@ -10074,14 +10073,14 @@ def list_awr_hub_objects(self, awr_hub_source_id, **kwargs): "limit": kwargs.get("limit", missing), "fields": kwargs.get("fields", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10225,7 +10224,7 @@ def list_awr_hub_sources(self, awr_hub_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_hub_sources got unknown kwargs: {extra_kwargs!r}") @@ -10281,14 +10280,14 @@ def list_awr_hub_sources(self, awr_hub_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10417,7 +10416,7 @@ def list_awr_hubs(self, operations_insights_warehouse_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_hubs got unknown kwargs: {extra_kwargs!r}") @@ -10455,14 +10454,14 @@ def list_awr_hubs(self, operations_insights_warehouse_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10583,7 +10582,7 @@ def list_awr_snapshots(self, awr_hub_id, awr_source_database_identifier, **kwarg "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_awr_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -10592,10 +10591,10 @@ def list_awr_snapshots(self, awr_hub_id, awr_source_database_identifier, **kwarg "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -10621,14 +10620,14 @@ def list_awr_snapshots(self, awr_hub_id, awr_source_database_identifier, **kwarg "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10817,7 +10816,7 @@ def list_database_configurations(self, **kwargs): "compartment_id_in_subtree", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_configurations got unknown kwargs: {extra_kwargs!r}") @@ -10864,14 +10863,14 @@ def list_database_configurations(self, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11039,7 +11038,7 @@ def list_database_insights(self, **kwargs): "opsi_private_endpoint_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_database_insights got unknown kwargs: {extra_kwargs!r}") @@ -11107,14 +11106,14 @@ def list_database_insights(self, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "opsiPrivateEndpointId": kwargs.get("opsi_private_endpoint_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11245,7 +11244,7 @@ def list_enterprise_manager_bridges(self, **kwargs): "compartment_id_in_subtree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_enterprise_manager_bridges got unknown kwargs: {extra_kwargs!r}") @@ -11283,14 +11282,14 @@ def list_enterprise_manager_bridges(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11442,7 +11441,7 @@ def list_exadata_configurations(self, **kwargs): "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_exadata_configurations got unknown kwargs: {extra_kwargs!r}") @@ -11474,14 +11473,14 @@ def list_exadata_configurations(self, **kwargs): "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11625,7 +11624,7 @@ def list_exadata_insights(self, **kwargs): "compartment_id_in_subtree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_exadata_insights got unknown kwargs: {extra_kwargs!r}") @@ -11673,14 +11672,14 @@ def list_exadata_insights(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11866,7 +11865,7 @@ def list_host_configurations(self, **kwargs): "host_id", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_configurations got unknown kwargs: {extra_kwargs!r}") @@ -11912,14 +11911,14 @@ def list_host_configurations(self, **kwargs): "hostId": kwargs.get("host_id", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12078,7 +12077,7 @@ def list_host_insights(self, **kwargs): "compartment_id_in_subtree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_insights got unknown kwargs: {extra_kwargs!r}") @@ -12136,14 +12135,14 @@ def list_host_insights(self, **kwargs): "exadataInsightId": kwargs.get("exadata_insight_id", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12307,7 +12306,7 @@ def list_hosted_entities(self, compartment_id, id, **kwargs): "host_type", "host_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_hosted_entities got unknown kwargs: {extra_kwargs!r}") @@ -12349,14 +12348,14 @@ def list_hosted_entities(self, compartment_id, id, **kwargs): "hostType": self.base_client.generate_collection_format_param(kwargs.get("host_type", missing), 'multi'), "hostId": kwargs.get("host_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12471,7 +12470,7 @@ def list_importable_agent_entities(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_importable_agent_entities got unknown kwargs: {extra_kwargs!r}") @@ -12497,14 +12496,14 @@ def list_importable_agent_entities(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12621,7 +12620,7 @@ def list_importable_compute_entities(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_importable_compute_entities got unknown kwargs: {extra_kwargs!r}") @@ -12647,14 +12646,14 @@ def list_importable_compute_entities(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12763,7 +12762,7 @@ def list_importable_enterprise_manager_entities(self, enterprise_manager_bridge_ "enterprise_manager_parent_entity_identifier", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_importable_enterprise_manager_entities got unknown kwargs: {extra_kwargs!r}") @@ -12772,10 +12771,10 @@ def list_importable_enterprise_manager_entities(self, enterprise_manager_bridge_ "enterpriseManagerBridgeId": enterprise_manager_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -12785,14 +12784,14 @@ def list_importable_enterprise_manager_entities(self, enterprise_manager_bridge_ "enterpriseManagerIdentifier": kwargs.get("enterprise_manager_identifier", missing), "enterpriseManagerParentEntityIdentifier": kwargs.get("enterprise_manager_parent_entity_identifier", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12926,7 +12925,7 @@ def list_news_reports(self, **kwargs): "compartment_id_in_subtree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_news_reports got unknown kwargs: {extra_kwargs!r}") @@ -12972,14 +12971,14 @@ def list_news_reports(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13119,7 +13118,7 @@ def list_operations_insights_private_endpoints(self, **kwargs): "compartment_id_in_subtree", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operations_insights_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -13159,14 +13158,14 @@ def list_operations_insights_private_endpoints(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13295,7 +13294,7 @@ def list_operations_insights_warehouse_users(self, operations_insights_warehouse "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operations_insights_warehouse_users got unknown kwargs: {extra_kwargs!r}") @@ -13333,14 +13332,14 @@ def list_operations_insights_warehouse_users(self, operations_insights_warehouse "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13467,7 +13466,7 @@ def list_operations_insights_warehouses(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_operations_insights_warehouses got unknown kwargs: {extra_kwargs!r}") @@ -13504,14 +13503,14 @@ def list_operations_insights_warehouses(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13638,7 +13637,7 @@ def list_opsi_configurations(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opsi_configurations got unknown kwargs: {extra_kwargs!r}") @@ -13683,14 +13682,14 @@ def list_opsi_configurations(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13819,7 +13818,7 @@ def list_opsi_data_objects(self, compartment_id, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_opsi_data_objects got unknown kwargs: {extra_kwargs!r}") @@ -13857,14 +13856,14 @@ def list_opsi_data_objects(self, compartment_id, **kwargs): "groupName": kwargs.get("group_name", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13974,7 +13973,7 @@ def list_sql_plans(self, compartment_id, sql_identifier, plan_hash, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_plans got unknown kwargs: {extra_kwargs!r}") @@ -13987,14 +13986,14 @@ def list_sql_plans(self, compartment_id, sql_identifier, plan_hash, **kwargs): "planHash": self.base_client.generate_collection_format_param(plan_hash, 'multi'), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14143,7 +14142,7 @@ def list_sql_searches(self, compartment_id, sql_identifier, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_searches got unknown kwargs: {extra_kwargs!r}") @@ -14161,14 +14160,14 @@ def list_sql_searches(self, compartment_id, sql_identifier, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14306,7 +14305,7 @@ def list_sql_texts(self, compartment_id, sql_identifier, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sql_texts got unknown kwargs: {extra_kwargs!r}") @@ -14323,14 +14322,14 @@ def list_sql_texts(self, compartment_id, sql_identifier, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14466,7 +14465,7 @@ def list_warehouse_data_objects(self, warehouse_type, warehouse_id, **kwargs): "summary_field", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_warehouse_data_objects got unknown kwargs: {extra_kwargs!r}") @@ -14476,10 +14475,10 @@ def list_warehouse_data_objects(self, warehouse_type, warehouse_id, **kwargs): "warehouseId": warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'data_object_type' in kwargs: @@ -14522,14 +14521,14 @@ def list_warehouse_data_objects(self, warehouse_type, warehouse_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "summaryField": self.base_client.generate_collection_format_param(kwargs.get("summary_field", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14640,7 +14639,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -14649,10 +14648,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14675,14 +14674,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14793,7 +14792,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -14802,10 +14801,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -14828,14 +14827,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14967,7 +14966,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -15004,14 +15003,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15110,7 +15109,7 @@ def put_awr_hub_object(self, put_awr_hub_object_body, awr_hub_source_id, object_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_awr_hub_object got unknown kwargs: {extra_kwargs!r}") @@ -15120,10 +15119,10 @@ def put_awr_hub_object(self, put_awr_hub_object_body, awr_hub_source_id, object_ "objectName": object_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15131,7 +15130,7 @@ def put_awr_hub_object(self, put_awr_hub_object_body, awr_hub_source_id, object_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -15140,7 +15139,7 @@ def put_awr_hub_object(self, put_awr_hub_object_body, awr_hub_source_id, object_ put_awr_hub_object_body = kwargs.get("put_awr_hub_object_body", missing) if put_awr_hub_object_body is not missing and put_awr_hub_object_body is not None: - if (not isinstance(put_awr_hub_object_body, (six.binary_type, six.string_types)) and + if (not isinstance(put_awr_hub_object_body, (bytes, str)) and not hasattr(put_awr_hub_object_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -15257,7 +15256,7 @@ def query_opsi_data_object_data(self, compartment_id, query_opsi_data_object_dat "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"query_opsi_data_object_data got unknown kwargs: {extra_kwargs!r}") @@ -15267,14 +15266,14 @@ def query_opsi_data_object_data(self, compartment_id, query_opsi_data_object_dat "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15384,7 +15383,7 @@ def query_warehouse_data_object_data(self, warehouse_type, warehouse_id, query_w "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"query_warehouse_data_object_data got unknown kwargs: {extra_kwargs!r}") @@ -15394,24 +15393,24 @@ def query_warehouse_data_object_data(self, warehouse_type, warehouse_id, query_w "warehouseId": warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15500,7 +15499,7 @@ def rotate_operations_insights_warehouse_wallet(self, operations_insights_wareho "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_operations_insights_warehouse_wallet got unknown kwargs: {extra_kwargs!r}") @@ -15509,10 +15508,10 @@ def rotate_operations_insights_warehouse_wallet(self, operations_insights_wareho "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15521,7 +15520,7 @@ def rotate_operations_insights_warehouse_wallet(self, operations_insights_wareho "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15698,7 +15697,7 @@ def summarize_addm_db_findings(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_findings got unknown kwargs: {extra_kwargs!r}") @@ -15735,14 +15734,14 @@ def summarize_addm_db_findings(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15928,7 +15927,7 @@ def summarize_addm_db_parameter_changes(self, compartment_id, name, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_parameter_changes got unknown kwargs: {extra_kwargs!r}") @@ -15966,14 +15965,14 @@ def summarize_addm_db_parameter_changes(self, compartment_id, name, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16183,7 +16182,7 @@ def summarize_addm_db_parameters(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_parameters got unknown kwargs: {extra_kwargs!r}") @@ -16245,14 +16244,14 @@ def summarize_addm_db_parameters(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16455,7 +16454,7 @@ def summarize_addm_db_recommendations(self, compartment_id, **kwargs): "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -16497,14 +16496,14 @@ def summarize_addm_db_recommendations(self, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16666,7 +16665,7 @@ def summarize_addm_db_schema_objects(self, compartment_id, object_identifier, ** "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_schema_objects got unknown kwargs: {extra_kwargs!r}") @@ -16686,14 +16685,14 @@ def summarize_addm_db_schema_objects(self, compartment_id, object_identifier, ** "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16856,7 +16855,7 @@ def summarize_addm_db_sql_statements(self, compartment_id, sql_identifier, **kwa "freeform_tag_exists", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_addm_db_sql_statements got unknown kwargs: {extra_kwargs!r}") @@ -16876,14 +16875,14 @@ def summarize_addm_db_sql_statements(self, compartment_id, sql_identifier, **kwa "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17029,7 +17028,7 @@ def summarize_awr_database_cpu_usages(self, awr_hub_id, awr_source_database_iden "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_cpu_usages got unknown kwargs: {extra_kwargs!r}") @@ -17038,10 +17037,10 @@ def summarize_awr_database_cpu_usages(self, awr_hub_id, awr_source_database_iden "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -17078,14 +17077,14 @@ def summarize_awr_database_cpu_usages(self, awr_hub_id, awr_source_database_iden "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17226,7 +17225,7 @@ def summarize_awr_database_metrics(self, awr_hub_id, awr_source_database_identif "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_metrics got unknown kwargs: {extra_kwargs!r}") @@ -17235,10 +17234,10 @@ def summarize_awr_database_metrics(self, awr_hub_id, awr_source_database_identif "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17268,14 +17267,14 @@ def summarize_awr_database_metrics(self, awr_hub_id, awr_source_database_identif "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17420,7 +17419,7 @@ def summarize_awr_database_parameter_changes(self, awr_hub_id, awr_source_databa "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_parameter_changes got unknown kwargs: {extra_kwargs!r}") @@ -17429,10 +17428,10 @@ def summarize_awr_database_parameter_changes(self, awr_hub_id, awr_source_databa "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17462,14 +17461,14 @@ def summarize_awr_database_parameter_changes(self, awr_hub_id, awr_source_databa "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17643,7 +17642,7 @@ def summarize_awr_database_parameters(self, awr_hub_id, awr_source_database_iden "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_parameters got unknown kwargs: {extra_kwargs!r}") @@ -17652,10 +17651,10 @@ def summarize_awr_database_parameters(self, awr_hub_id, awr_source_database_iden "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'value_changed' in kwargs: @@ -17710,14 +17709,14 @@ def summarize_awr_database_parameters(self, awr_hub_id, awr_source_database_iden "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17840,7 +17839,7 @@ def summarize_awr_database_snapshot_ranges(self, awr_hub_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_snapshot_ranges got unknown kwargs: {extra_kwargs!r}") @@ -17849,10 +17848,10 @@ def summarize_awr_database_snapshot_ranges(self, awr_hub_id, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -17878,14 +17877,14 @@ def summarize_awr_database_snapshot_ranges(self, awr_hub_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18026,7 +18025,7 @@ def summarize_awr_database_sysstats(self, awr_hub_id, awr_source_database_identi "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_sysstats got unknown kwargs: {extra_kwargs!r}") @@ -18035,10 +18034,10 @@ def summarize_awr_database_sysstats(self, awr_hub_id, awr_source_database_identi "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18068,14 +18067,14 @@ def summarize_awr_database_sysstats(self, awr_hub_id, awr_source_database_identi "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18205,7 +18204,7 @@ def summarize_awr_database_top_wait_events(self, awr_hub_id, awr_source_database "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_top_wait_events got unknown kwargs: {extra_kwargs!r}") @@ -18214,10 +18213,10 @@ def summarize_awr_database_top_wait_events(self, awr_hub_id, awr_source_database "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -18253,14 +18252,14 @@ def summarize_awr_database_top_wait_events(self, awr_hub_id, awr_source_database "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18413,7 +18412,7 @@ def summarize_awr_database_wait_event_buckets(self, awr_hub_id, awr_source_datab "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_wait_event_buckets got unknown kwargs: {extra_kwargs!r}") @@ -18422,10 +18421,10 @@ def summarize_awr_database_wait_event_buckets(self, awr_hub_id, awr_source_datab "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18458,14 +18457,14 @@ def summarize_awr_database_wait_event_buckets(self, awr_hub_id, awr_source_datab "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18613,7 +18612,7 @@ def summarize_awr_database_wait_events(self, awr_hub_id, awr_source_database_ide "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_database_wait_events got unknown kwargs: {extra_kwargs!r}") @@ -18622,10 +18621,10 @@ def summarize_awr_database_wait_events(self, awr_hub_id, awr_source_database_ide "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'session_type' in kwargs: @@ -18663,14 +18662,14 @@ def summarize_awr_database_wait_events(self, awr_hub_id, awr_source_database_ide "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18791,7 +18790,7 @@ def summarize_awr_sources_summaries(self, awr_hub_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_awr_sources_summaries got unknown kwargs: {extra_kwargs!r}") @@ -18800,10 +18799,10 @@ def summarize_awr_sources_summaries(self, awr_hub_id, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -18828,14 +18827,14 @@ def summarize_awr_sources_summaries(self, awr_hub_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18958,7 +18957,7 @@ def summarize_configuration_items(self, **kwargs): "name", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_configuration_items got unknown kwargs: {extra_kwargs!r}") @@ -18987,14 +18986,14 @@ def summarize_configuration_items(self, **kwargs): "configItemField": self.base_client.generate_collection_format_param(kwargs.get("config_item_field", missing), 'multi'), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19221,7 +19220,7 @@ def summarize_database_insight_resource_capacity_trend(self, compartment_id, res "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_capacity_trend got unknown kwargs: {extra_kwargs!r}") @@ -19282,14 +19281,14 @@ def summarize_database_insight_resource_capacity_trend(self, compartment_id, res "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19531,7 +19530,7 @@ def summarize_database_insight_resource_forecast_trend(self, compartment_id, res "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_forecast_trend got unknown kwargs: {extra_kwargs!r}") @@ -19594,14 +19593,14 @@ def summarize_database_insight_resource_forecast_trend(self, compartment_id, res "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -19837,7 +19836,7 @@ def summarize_database_insight_resource_statistics(self, compartment_id, resourc "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_statistics got unknown kwargs: {extra_kwargs!r}") @@ -19893,14 +19892,14 @@ def summarize_database_insight_resource_statistics(self, compartment_id, resourc "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20098,7 +20097,7 @@ def summarize_database_insight_resource_usage(self, compartment_id, resource_met "vmcluster_name", "cdb_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -20133,14 +20132,14 @@ def summarize_database_insight_resource_usage(self, compartment_id, resource_met "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi'), "cdbName": self.base_client.generate_collection_format_param(kwargs.get("cdb_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20345,7 +20344,7 @@ def summarize_database_insight_resource_usage_trend(self, compartment_id, resour "vmcluster_name", "cdb_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -20395,14 +20394,14 @@ def summarize_database_insight_resource_usage_trend(self, compartment_id, resour "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi'), "cdbName": self.base_client.generate_collection_format_param(kwargs.get("cdb_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20606,7 +20605,7 @@ def summarize_database_insight_resource_utilization_insight(self, compartment_id "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_resource_utilization_insight got unknown kwargs: {extra_kwargs!r}") @@ -20643,14 +20642,14 @@ def summarize_database_insight_resource_utilization_insight(self, compartment_id "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20785,7 +20784,7 @@ def summarize_database_insight_tablespace_usage_trend(self, compartment_id, **kw "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_database_insight_tablespace_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -20800,14 +20799,14 @@ def summarize_database_insight_tablespace_usage_trend(self, compartment_id, **kw "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20990,7 +20989,7 @@ def summarize_exadata_insight_resource_capacity_trend(self, resource_type, resou "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_capacity_trend got unknown kwargs: {extra_kwargs!r}") @@ -21028,14 +21027,14 @@ def summarize_exadata_insight_resource_capacity_trend(self, resource_type, resou "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21219,7 +21218,7 @@ def summarize_exadata_insight_resource_capacity_trend_aggregated(self, resource_ "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_capacity_trend_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -21257,14 +21256,14 @@ def summarize_exadata_insight_resource_capacity_trend_aggregated(self, resource_ "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21473,7 +21472,7 @@ def summarize_exadata_insight_resource_forecast_trend(self, resource_type, resou "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_forecast_trend got unknown kwargs: {extra_kwargs!r}") @@ -21529,14 +21528,14 @@ def summarize_exadata_insight_resource_forecast_trend(self, resource_type, resou "sortBy": kwargs.get("sort_by", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21739,7 +21738,7 @@ def summarize_exadata_insight_resource_forecast_trend_aggregated(self, resource_ "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_forecast_trend_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -21780,14 +21779,14 @@ def summarize_exadata_insight_resource_forecast_trend_aggregated(self, resource_ "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -21949,7 +21948,7 @@ def summarize_exadata_insight_resource_statistics(self, exadata_insight_id, reso "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_statistics got unknown kwargs: {extra_kwargs!r}") @@ -21984,14 +21983,14 @@ def summarize_exadata_insight_resource_statistics(self, exadata_insight_id, reso "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22189,7 +22188,7 @@ def summarize_exadata_insight_resource_usage(self, compartment_id, resource_type "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -22229,14 +22228,14 @@ def summarize_exadata_insight_resource_usage(self, compartment_id, resource_type "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22412,7 +22411,7 @@ def summarize_exadata_insight_resource_usage_aggregated(self, compartment_id, re "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_usage_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -22435,14 +22434,14 @@ def summarize_exadata_insight_resource_usage_aggregated(self, compartment_id, re "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22627,7 +22626,7 @@ def summarize_exadata_insight_resource_utilization_insight(self, compartment_id, "freeform_tag_exists", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_insight_resource_utilization_insight got unknown kwargs: {extra_kwargs!r}") @@ -22652,14 +22651,14 @@ def summarize_exadata_insight_resource_utilization_insight(self, compartment_id, "definedTagExists": self.base_client.generate_collection_format_param(kwargs.get("defined_tag_exists", missing), 'multi'), "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22775,7 +22774,7 @@ def summarize_exadata_members(self, exadata_insight_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_exadata_members got unknown kwargs: {extra_kwargs!r}") @@ -22802,14 +22801,14 @@ def summarize_exadata_members(self, exadata_insight_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22929,7 +22928,7 @@ def summarize_host_insight_disk_statistics(self, compartment_id, id, **kwargs): "statistic", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_disk_statistics got unknown kwargs: {extra_kwargs!r}") @@ -22950,14 +22949,14 @@ def summarize_host_insight_disk_statistics(self, compartment_id, id, **kwargs): "hostId": kwargs.get("host_id", missing), "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23091,7 +23090,7 @@ def summarize_host_insight_host_recommendation(self, compartment_id, id, resourc "statistic", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_host_recommendation got unknown kwargs: {extra_kwargs!r}") @@ -23114,14 +23113,14 @@ def summarize_host_insight_host_recommendation(self, compartment_id, id, resourc "limit": kwargs.get("limit", missing), "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23259,7 +23258,7 @@ def summarize_host_insight_network_usage_trend(self, compartment_id, id, **kwarg "statistic", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_network_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -23282,14 +23281,14 @@ def summarize_host_insight_network_usage_trend(self, compartment_id, id, **kwarg "limit": kwargs.get("limit", missing), "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23505,7 +23504,7 @@ def summarize_host_insight_resource_capacity_trend(self, compartment_id, resourc "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_capacity_trend got unknown kwargs: {extra_kwargs!r}") @@ -23563,14 +23562,14 @@ def summarize_host_insight_resource_capacity_trend(self, compartment_id, resourc "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23809,7 +23808,7 @@ def summarize_host_insight_resource_forecast_trend(self, compartment_id, resourc "mount_point", "interface_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_forecast_trend got unknown kwargs: {extra_kwargs!r}") @@ -23871,14 +23870,14 @@ def summarize_host_insight_resource_forecast_trend(self, compartment_id, resourc "mountPoint": kwargs.get("mount_point", missing), "interfaceName": kwargs.get("interface_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24107,7 +24106,7 @@ def summarize_host_insight_resource_statistics(self, compartment_id, resource_me "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_statistics got unknown kwargs: {extra_kwargs!r}") @@ -24161,14 +24160,14 @@ def summarize_host_insight_resource_statistics(self, compartment_id, resource_me "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24359,7 +24358,7 @@ def summarize_host_insight_resource_usage(self, compartment_id, resource_metric, "host_id", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -24392,14 +24391,14 @@ def summarize_host_insight_resource_usage(self, compartment_id, resource_metric, "hostId": kwargs.get("host_id", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24597,7 +24596,7 @@ def summarize_host_insight_resource_usage_trend(self, compartment_id, resource_m "host_id", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -24645,14 +24644,14 @@ def summarize_host_insight_resource_usage_trend(self, compartment_id, resource_m "hostId": kwargs.get("host_id", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -24849,7 +24848,7 @@ def summarize_host_insight_resource_utilization_insight(self, compartment_id, re "high_utilization_threshold", "low_utilization_threshold" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_resource_utilization_insight got unknown kwargs: {extra_kwargs!r}") @@ -24884,14 +24883,14 @@ def summarize_host_insight_resource_utilization_insight(self, compartment_id, re "highUtilizationThreshold": kwargs.get("high_utilization_threshold", missing), "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25029,7 +25028,7 @@ def summarize_host_insight_storage_usage_trend(self, compartment_id, id, **kwarg "statistic", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_storage_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -25052,14 +25051,14 @@ def summarize_host_insight_storage_usage_trend(self, compartment_id, id, **kwarg "limit": kwargs.get("limit", missing), "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25212,7 +25211,7 @@ def summarize_host_insight_top_processes_usage(self, compartment_id, id, resourc "host_id", "statistic" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_top_processes_usage got unknown kwargs: {extra_kwargs!r}") @@ -25238,14 +25237,14 @@ def summarize_host_insight_top_processes_usage(self, compartment_id, id, resourc "timestamp": timestamp, "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25398,7 +25397,7 @@ def summarize_host_insight_top_processes_usage_trend(self, compartment_id, id, r "process_hash", "statistic" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_host_insight_top_processes_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -25424,14 +25423,14 @@ def summarize_host_insight_top_processes_usage_trend(self, compartment_id, id, r "processHash": kwargs.get("process_hash", missing), "statistic": kwargs.get("statistic", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25511,7 +25510,7 @@ def summarize_operations_insights_warehouse_resource_usage(self, operations_insi "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_operations_insights_warehouse_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -25520,10 +25519,10 @@ def summarize_operations_insights_warehouse_resource_usage(self, operations_insi "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25531,7 +25530,7 @@ def summarize_operations_insights_warehouse_resource_usage(self, operations_insi "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25717,7 +25716,7 @@ def summarize_sql_insights(self, compartment_id, **kwargs): "compartment_id_in_subtree", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_insights got unknown kwargs: {extra_kwargs!r}") @@ -25750,14 +25749,14 @@ def summarize_sql_insights(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -25885,7 +25884,7 @@ def summarize_sql_plan_insights(self, compartment_id, sql_identifier, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_plan_insights got unknown kwargs: {extra_kwargs!r}") @@ -25900,14 +25899,14 @@ def summarize_sql_plan_insights(self, compartment_id, sql_identifier, **kwargs): "timeIntervalEnd": kwargs.get("time_interval_end", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26035,7 +26034,7 @@ def summarize_sql_response_time_distributions(self, compartment_id, sql_identifi "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_response_time_distributions got unknown kwargs: {extra_kwargs!r}") @@ -26050,14 +26049,14 @@ def summarize_sql_response_time_distributions(self, compartment_id, sql_identifi "timeIntervalEnd": kwargs.get("time_interval_end", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26277,7 +26276,7 @@ def summarize_sql_statistics(self, compartment_id, **kwargs): "compartment_id_in_subtree", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_statistics got unknown kwargs: {extra_kwargs!r}") @@ -26337,14 +26336,14 @@ def summarize_sql_statistics(self, compartment_id, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26523,7 +26522,7 @@ def summarize_sql_statistics_time_series(self, compartment_id, sql_identifier, * "compartment_id_in_subtree", "vmcluster_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_statistics_time_series got unknown kwargs: {extra_kwargs!r}") @@ -26547,14 +26546,14 @@ def summarize_sql_statistics_time_series(self, compartment_id, sql_identifier, * "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing), "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26682,7 +26681,7 @@ def summarize_sql_statistics_time_series_by_plan(self, compartment_id, sql_ident "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_sql_statistics_time_series_by_plan got unknown kwargs: {extra_kwargs!r}") @@ -26697,14 +26696,14 @@ def summarize_sql_statistics_time_series_by_plan(self, compartment_id, sql_ident "timeIntervalEnd": kwargs.get("time_interval_end", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26792,7 +26791,7 @@ def update_awr_hub(self, awr_hub_id, update_awr_hub_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_awr_hub got unknown kwargs: {extra_kwargs!r}") @@ -26801,10 +26800,10 @@ def update_awr_hub(self, awr_hub_id, update_awr_hub_details, **kwargs): "awrHubId": awr_hub_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26813,7 +26812,7 @@ def update_awr_hub(self, awr_hub_id, update_awr_hub_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26901,7 +26900,7 @@ def update_awr_hub_source(self, update_awr_hub_source_details, awr_hub_source_id "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_awr_hub_source got unknown kwargs: {extra_kwargs!r}") @@ -26910,10 +26909,10 @@ def update_awr_hub_source(self, update_awr_hub_source_details, awr_hub_source_id "awrHubSourceId": awr_hub_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -26922,7 +26921,7 @@ def update_awr_hub_source(self, update_awr_hub_source_details, awr_hub_source_id "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27010,7 +27009,7 @@ def update_database_insight(self, database_insight_id, update_database_insight_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_database_insight got unknown kwargs: {extra_kwargs!r}") @@ -27019,10 +27018,10 @@ def update_database_insight(self, database_insight_id, update_database_insight_d "databaseInsightId": database_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27031,7 +27030,7 @@ def update_database_insight(self, database_insight_id, update_database_insight_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27119,7 +27118,7 @@ def update_enterprise_manager_bridge(self, enterprise_manager_bridge_id, update_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_enterprise_manager_bridge got unknown kwargs: {extra_kwargs!r}") @@ -27128,10 +27127,10 @@ def update_enterprise_manager_bridge(self, enterprise_manager_bridge_id, update_ "enterpriseManagerBridgeId": enterprise_manager_bridge_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27140,7 +27139,7 @@ def update_enterprise_manager_bridge(self, enterprise_manager_bridge_id, update_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27228,7 +27227,7 @@ def update_exadata_insight(self, exadata_insight_id, update_exadata_insight_deta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_exadata_insight got unknown kwargs: {extra_kwargs!r}") @@ -27237,10 +27236,10 @@ def update_exadata_insight(self, exadata_insight_id, update_exadata_insight_deta "exadataInsightId": exadata_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27249,7 +27248,7 @@ def update_exadata_insight(self, exadata_insight_id, update_exadata_insight_deta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27337,7 +27336,7 @@ def update_host_insight(self, host_insight_id, update_host_insight_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_host_insight got unknown kwargs: {extra_kwargs!r}") @@ -27346,10 +27345,10 @@ def update_host_insight(self, host_insight_id, update_host_insight_details, **kw "hostInsightId": host_insight_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27358,7 +27357,7 @@ def update_host_insight(self, host_insight_id, update_host_insight_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27446,7 +27445,7 @@ def update_news_report(self, news_report_id, update_news_report_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_news_report got unknown kwargs: {extra_kwargs!r}") @@ -27455,10 +27454,10 @@ def update_news_report(self, news_report_id, update_news_report_details, **kwarg "newsReportId": news_report_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27467,7 +27466,7 @@ def update_news_report(self, news_report_id, update_news_report_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27557,7 +27556,7 @@ def update_operations_insights_private_endpoint(self, operations_insights_privat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_operations_insights_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -27566,10 +27565,10 @@ def update_operations_insights_private_endpoint(self, operations_insights_privat "operationsInsightsPrivateEndpointId": operations_insights_private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27578,7 +27577,7 @@ def update_operations_insights_private_endpoint(self, operations_insights_privat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27667,7 +27666,7 @@ def update_operations_insights_warehouse(self, operations_insights_warehouse_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_operations_insights_warehouse got unknown kwargs: {extra_kwargs!r}") @@ -27676,10 +27675,10 @@ def update_operations_insights_warehouse(self, operations_insights_warehouse_id, "operationsInsightsWarehouseId": operations_insights_warehouse_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27688,7 +27687,7 @@ def update_operations_insights_warehouse(self, operations_insights_warehouse_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27776,7 +27775,7 @@ def update_operations_insights_warehouse_user(self, operations_insights_warehous "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_operations_insights_warehouse_user got unknown kwargs: {extra_kwargs!r}") @@ -27785,10 +27784,10 @@ def update_operations_insights_warehouse_user(self, operations_insights_warehous "operationsInsightsWarehouseUserId": operations_insights_warehouse_user_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27797,7 +27796,7 @@ def update_operations_insights_warehouse_user(self, operations_insights_warehous "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27887,7 +27886,7 @@ def update_opsi_configuration(self, opsi_configuration_id, update_opsi_configura "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_opsi_configuration got unknown kwargs: {extra_kwargs!r}") @@ -27896,10 +27895,10 @@ def update_opsi_configuration(self, opsi_configuration_id, update_opsi_configura "opsiConfigurationId": opsi_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -27908,7 +27907,7 @@ def update_opsi_configuration(self, opsi_configuration_id, update_opsi_configura "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/optimizer/optimizer_client.py b/src/oci/optimizer/optimizer_client.py index a42d6bd54e..92b7bec725 100644 --- a/src/oci/optimizer/optimizer_client.py +++ b/src/oci/optimizer/optimizer_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def bulk_apply_recommendations(self, recommendation_id, bulk_apply_recommendatio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_apply_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def bulk_apply_recommendations(self, recommendation_id, bulk_apply_recommendatio "recommendationId": recommendation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -193,7 +192,7 @@ def bulk_apply_recommendations(self, recommendation_id, bulk_apply_recommendatio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def create_profile(self, create_profile_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_profile got unknown kwargs: {extra_kwargs!r}") @@ -292,7 +291,7 @@ def create_profile(self, create_profile_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -380,7 +379,7 @@ def delete_profile(self, profile_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_profile got unknown kwargs: {extra_kwargs!r}") @@ -389,10 +388,10 @@ def delete_profile(self, profile_id, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -401,7 +400,7 @@ def delete_profile(self, profile_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -536,7 +535,7 @@ def filter_resource_actions(self, compartment_id, compartment_id_in_subtree, que "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"filter_resource_actions got unknown kwargs: {extra_kwargs!r}") @@ -552,14 +551,14 @@ def filter_resource_actions(self, compartment_id, compartment_id_in_subtree, que "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -640,7 +639,7 @@ def get_category(self, category_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_category got unknown kwargs: {extra_kwargs!r}") @@ -649,10 +648,10 @@ def get_category(self, category_id, **kwargs): "categoryId": category_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -660,7 +659,7 @@ def get_category(self, category_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -739,7 +738,7 @@ def get_enrollment_status(self, enrollment_status_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_enrollment_status got unknown kwargs: {extra_kwargs!r}") @@ -748,10 +747,10 @@ def get_enrollment_status(self, enrollment_status_id, **kwargs): "enrollmentStatusId": enrollment_status_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -759,7 +758,7 @@ def get_enrollment_status(self, enrollment_status_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -838,7 +837,7 @@ def get_profile(self, profile_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_profile got unknown kwargs: {extra_kwargs!r}") @@ -847,10 +846,10 @@ def get_profile(self, profile_id, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -858,7 +857,7 @@ def get_profile(self, profile_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -937,7 +936,7 @@ def get_recommendation(self, recommendation_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_recommendation got unknown kwargs: {extra_kwargs!r}") @@ -946,10 +945,10 @@ def get_recommendation(self, recommendation_id, **kwargs): "recommendationId": recommendation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -957,7 +956,7 @@ def get_recommendation(self, recommendation_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1040,7 +1039,7 @@ def get_resource_action(self, resource_action_id, **kwargs): "include_resource_metadata", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resource_action got unknown kwargs: {extra_kwargs!r}") @@ -1049,23 +1048,23 @@ def get_resource_action(self, resource_action_id, **kwargs): "resourceActionId": resource_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "includeResourceMetadata": kwargs.get("include_resource_metadata", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1146,7 +1145,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1155,10 +1154,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1166,7 +1165,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1310,7 +1309,7 @@ def list_categories(self, compartment_id, compartment_id_in_subtree, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_categories got unknown kwargs: {extra_kwargs!r}") @@ -1348,14 +1347,14 @@ def list_categories(self, compartment_id, compartment_id_in_subtree, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1466,7 +1465,7 @@ def list_enrollment_statuses(self, compartment_id, **kwargs): "status", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_enrollment_statuses got unknown kwargs: {extra_kwargs!r}") @@ -1508,14 +1507,14 @@ def list_enrollment_statuses(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "status": kwargs.get("status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1652,7 +1651,7 @@ def list_histories(self, compartment_id, compartment_id_in_subtree, **kwargs): "include_resource_metadata", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_histories got unknown kwargs: {extra_kwargs!r}") @@ -1700,14 +1699,14 @@ def list_histories(self, compartment_id, compartment_id_in_subtree, **kwargs): "status": kwargs.get("status", missing), "includeResourceMetadata": kwargs.get("include_resource_metadata", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1819,7 +1818,7 @@ def list_profile_levels(self, compartment_id, compartment_id_in_subtree, **kwarg "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_profile_levels got unknown kwargs: {extra_kwargs!r}") @@ -1848,14 +1847,14 @@ def list_profile_levels(self, compartment_id, compartment_id_in_subtree, **kwarg "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1964,7 +1963,7 @@ def list_profiles(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_profiles got unknown kwargs: {extra_kwargs!r}") @@ -1999,14 +1998,14 @@ def list_profiles(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2118,7 +2117,7 @@ def list_recommendation_strategies(self, compartment_id, compartment_id_in_subtr "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recommendation_strategies got unknown kwargs: {extra_kwargs!r}") @@ -2147,14 +2146,14 @@ def list_recommendation_strategies(self, compartment_id, compartment_id_in_subtr "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2312,7 +2311,7 @@ def list_recommendations(self, compartment_id, compartment_id_in_subtree, **kwar "status", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -2360,14 +2359,14 @@ def list_recommendations(self, compartment_id, compartment_id_in_subtree, **kwar "lifecycleState": kwargs.get("lifecycle_state", missing), "status": kwargs.get("status", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2459,7 +2458,7 @@ def list_resource_action_queryable_fields(self, compartment_id, compartment_id_i "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_action_queryable_fields got unknown kwargs: {extra_kwargs!r}") @@ -2470,14 +2469,14 @@ def list_resource_action_queryable_fields(self, compartment_id, compartment_id_i "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2643,7 +2642,7 @@ def list_resource_actions(self, compartment_id, compartment_id_in_subtree, **kwa "include_resource_metadata", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_actions got unknown kwargs: {extra_kwargs!r}") @@ -2693,14 +2692,14 @@ def list_resource_actions(self, compartment_id, compartment_id_in_subtree, **kwa "status": kwargs.get("status", missing), "includeResourceMetadata": kwargs.get("include_resource_metadata", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2787,7 +2786,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2796,24 +2795,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2902,7 +2901,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2911,24 +2910,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3017,7 +3016,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3027,14 +3026,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3124,7 +3123,7 @@ def update_enrollment_status(self, enrollment_status_id, update_enrollment_statu "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_enrollment_status got unknown kwargs: {extra_kwargs!r}") @@ -3133,10 +3132,10 @@ def update_enrollment_status(self, enrollment_status_id, update_enrollment_statu "enrollmentStatusId": enrollment_status_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3145,7 +3144,7 @@ def update_enrollment_status(self, enrollment_status_id, update_enrollment_statu "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3237,7 +3236,7 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_profile got unknown kwargs: {extra_kwargs!r}") @@ -3246,10 +3245,10 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3258,7 +3257,7 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3355,7 +3354,7 @@ def update_recommendation(self, recommendation_id, update_recommendation_details "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_recommendation got unknown kwargs: {extra_kwargs!r}") @@ -3364,10 +3363,10 @@ def update_recommendation(self, recommendation_id, update_recommendation_details "recommendationId": recommendation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3376,7 +3375,7 @@ def update_recommendation(self, recommendation_id, update_recommendation_details "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3471,7 +3470,7 @@ def update_resource_action(self, resource_action_id, update_resource_action_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_resource_action got unknown kwargs: {extra_kwargs!r}") @@ -3480,10 +3479,10 @@ def update_resource_action(self, resource_action_id, update_resource_action_deta "resourceActionId": resource_action_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3492,7 +3491,7 @@ def update_resource_action(self, resource_action_id, update_resource_action_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management/event_client.py b/src/oci/os_management/event_client.py index 2f6e79c105..feb82fdb01 100644 --- a/src/oci/os_management/event_client.py +++ b/src/oci/os_management/event_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def delete_event_content(self, managed_instance_id, event_id, compartment_id, ** "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_event_content got unknown kwargs: {extra_kwargs!r}") @@ -191,16 +190,16 @@ def delete_event_content(self, managed_instance_id, event_id, compartment_id, ** "eventId": event_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -209,7 +208,7 @@ def delete_event_content(self, managed_instance_id, event_id, compartment_id, ** "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -292,7 +291,7 @@ def get_event(self, managed_instance_id, event_id, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_event got unknown kwargs: {extra_kwargs!r}") @@ -302,23 +301,23 @@ def get_event(self, managed_instance_id, event_id, compartment_id, **kwargs): "eventId": event_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -402,7 +401,7 @@ def get_event_content(self, managed_instance_id, event_id, compartment_id, **kwa "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_event_content got unknown kwargs: {extra_kwargs!r}") @@ -412,23 +411,23 @@ def get_event_content(self, managed_instance_id, event_id, compartment_id, **kwa "eventId": event_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/octet-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -519,7 +518,7 @@ def get_event_report(self, managed_instance_id, compartment_id, **kwargs): "latest_timestamp_greater_than_or_equal_to", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_event_report got unknown kwargs: {extra_kwargs!r}") @@ -528,10 +527,10 @@ def get_event_report(self, managed_instance_id, compartment_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -539,14 +538,14 @@ def get_event_report(self, managed_instance_id, compartment_id, **kwargs): "latestTimestampLessThan": kwargs.get("latest_timestamp_less_than", missing), "latestTimestampGreaterThanOrEqualTo": kwargs.get("latest_timestamp_greater_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -667,7 +666,7 @@ def list_events(self, managed_instance_id, compartment_id, **kwargs): "latest_timestamp_less_than", "latest_timestamp_greater_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_events got unknown kwargs: {extra_kwargs!r}") @@ -676,10 +675,10 @@ def list_events(self, managed_instance_id, compartment_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -714,14 +713,14 @@ def list_events(self, managed_instance_id, compartment_id, **kwargs): "latestTimestampLessThan": kwargs.get("latest_timestamp_less_than", missing), "latestTimestampGreaterThanOrEqualTo": kwargs.get("latest_timestamp_greater_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -832,7 +831,7 @@ def list_related_events(self, event_fingerprint, compartment_id, **kwargs): "latest_timestamp_less_than", "latest_timestamp_greater_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_related_events got unknown kwargs: {extra_kwargs!r}") @@ -861,14 +860,14 @@ def list_related_events(self, event_fingerprint, compartment_id, **kwargs): "eventFingerprint": event_fingerprint, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -961,7 +960,7 @@ def update_event(self, managed_instance_id, event_id, compartment_id, update_eve "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_event got unknown kwargs: {extra_kwargs!r}") @@ -971,16 +970,16 @@ def update_event(self, managed_instance_id, event_id, compartment_id, update_eve "eventId": event_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -988,7 +987,7 @@ def update_event(self, managed_instance_id, event_id, compartment_id, update_eve "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1090,7 +1089,7 @@ def upload_event_content(self, managed_instance_id, event_id, compartment_id, ** "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"upload_event_content got unknown kwargs: {extra_kwargs!r}") @@ -1100,16 +1099,16 @@ def upload_event_content(self, managed_instance_id, event_id, compartment_id, ** "eventId": event_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1118,7 +1117,7 @@ def upload_event_content(self, managed_instance_id, event_id, compartment_id, ** "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management/os_management_client.py b/src/oci/os_management/os_management_client.py index e43b4057eb..46bb416865 100644 --- a/src/oci/os_management/os_management_client.py +++ b/src/oci/os_management/os_management_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def add_packages_to_software_source(self, software_source_id, add_packages_to_so "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_packages_to_software_source got unknown kwargs: {extra_kwargs!r}") @@ -171,10 +170,10 @@ def add_packages_to_software_source(self, software_source_id, add_packages_to_so "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -182,7 +181,7 @@ def add_packages_to_software_source(self, software_source_id, add_packages_to_so "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def attach_child_software_source_to_managed_instance(self, managed_instance_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_child_software_source_to_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def attach_child_software_source_to_managed_instance(self, managed_instance_id, "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def attach_child_software_source_to_managed_instance(self, managed_instance_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def attach_managed_instance_to_managed_instance_group(self, managed_instance_gro "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_managed_instance_to_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -392,16 +391,16 @@ def attach_managed_instance_to_managed_instance_group(self, managed_instance_gro "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "managedInstanceId": managed_instance_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -409,7 +408,7 @@ def attach_managed_instance_to_managed_instance_group(self, managed_instance_gro "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -500,7 +499,7 @@ def attach_parent_software_source_to_managed_instance(self, managed_instance_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_parent_software_source_to_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -509,10 +508,10 @@ def attach_parent_software_source_to_managed_instance(self, managed_instance_id, "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -521,7 +520,7 @@ def attach_parent_software_source_to_managed_instance(self, managed_instance_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -618,7 +617,7 @@ def change_managed_instance_group_compartment(self, managed_instance_group_id, c "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_managed_instance_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -627,10 +626,10 @@ def change_managed_instance_group_compartment(self, managed_instance_group_id, c "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -640,7 +639,7 @@ def change_managed_instance_group_compartment(self, managed_instance_group_id, c "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -737,7 +736,7 @@ def change_scheduled_job_compartment(self, scheduled_job_id, change_scheduled_jo "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_scheduled_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -746,10 +745,10 @@ def change_scheduled_job_compartment(self, scheduled_job_id, change_scheduled_jo "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -759,7 +758,7 @@ def change_scheduled_job_compartment(self, scheduled_job_id, change_scheduled_jo "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -856,7 +855,7 @@ def change_software_source_compartment(self, software_source_id, change_software "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_software_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -865,10 +864,10 @@ def change_software_source_compartment(self, software_source_id, change_software "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -878,7 +877,7 @@ def change_software_source_compartment(self, software_source_id, change_software "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -965,7 +964,7 @@ def create_managed_instance_group(self, create_managed_instance_group_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -976,7 +975,7 @@ def create_managed_instance_group(self, create_managed_instance_group_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1064,7 +1063,7 @@ def create_scheduled_job(self, create_scheduled_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -1075,7 +1074,7 @@ def create_scheduled_job(self, create_scheduled_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1162,7 +1161,7 @@ def create_software_source(self, create_software_source_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_software_source got unknown kwargs: {extra_kwargs!r}") @@ -1173,7 +1172,7 @@ def create_software_source(self, create_software_source_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1258,7 +1257,7 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1267,10 +1266,10 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1279,7 +1278,7 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1361,7 +1360,7 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -1370,10 +1369,10 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1382,7 +1381,7 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1464,7 +1463,7 @@ def delete_software_source(self, software_source_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_software_source got unknown kwargs: {extra_kwargs!r}") @@ -1473,10 +1472,10 @@ def delete_software_source(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1485,7 +1484,7 @@ def delete_software_source(self, software_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1571,7 +1570,7 @@ def detach_child_software_source_from_managed_instance(self, managed_instance_id "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_child_software_source_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -1580,10 +1579,10 @@ def detach_child_software_source_from_managed_instance(self, managed_instance_id "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1592,7 +1591,7 @@ def detach_child_software_source_from_managed_instance(self, managed_instance_id "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1680,7 +1679,7 @@ def detach_managed_instance_from_managed_instance_group(self, managed_instance_g "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_managed_instance_from_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1689,16 +1688,16 @@ def detach_managed_instance_from_managed_instance_group(self, managed_instance_g "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "managedInstanceId": managed_instance_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1706,7 +1705,7 @@ def detach_managed_instance_from_managed_instance_group(self, managed_instance_g "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1795,7 +1794,7 @@ def detach_parent_software_source_from_managed_instance(self, managed_instance_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_parent_software_source_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -1804,10 +1803,10 @@ def detach_parent_software_source_from_managed_instance(self, managed_instance_i "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1816,7 +1815,7 @@ def detach_parent_software_source_from_managed_instance(self, managed_instance_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1920,7 +1919,7 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, module_ "if_match", "stream_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -1929,17 +1928,17 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, module_ "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "moduleName": module_name, "streamName": kwargs.get("stream_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1948,7 +1947,7 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, module_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2053,7 +2052,7 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, module_n "if_match", "stream_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2062,17 +2061,17 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, module_n "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "moduleName": module_name, "streamName": kwargs.get("stream_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2081,7 +2080,7 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, module_n "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2158,7 +2157,7 @@ def get_erratum(self, erratum_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_erratum got unknown kwargs: {extra_kwargs!r}") @@ -2167,10 +2166,10 @@ def get_erratum(self, erratum_id, **kwargs): "erratumId": erratum_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2178,7 +2177,7 @@ def get_erratum(self, erratum_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2254,7 +2253,7 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2263,10 +2262,10 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2274,7 +2273,7 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2350,7 +2349,7 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2359,10 +2358,10 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2370,7 +2369,7 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2452,7 +2451,7 @@ def get_module_stream(self, software_source_id, module_name, stream_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_module_stream got unknown kwargs: {extra_kwargs!r}") @@ -2463,10 +2462,10 @@ def get_module_stream(self, software_source_id, module_name, stream_name, **kwar "streamName": stream_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2474,7 +2473,7 @@ def get_module_stream(self, software_source_id, module_name, stream_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2559,7 +2558,7 @@ def get_module_stream_profile(self, software_source_id, module_name, stream_name "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_module_stream_profile got unknown kwargs: {extra_kwargs!r}") @@ -2571,10 +2570,10 @@ def get_module_stream_profile(self, software_source_id, module_name, stream_name "profileName": profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2582,7 +2581,7 @@ def get_module_stream_profile(self, software_source_id, module_name, stream_name "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2658,7 +2657,7 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -2667,10 +2666,10 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2678,7 +2677,7 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2757,7 +2756,7 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_software_package got unknown kwargs: {extra_kwargs!r}") @@ -2767,10 +2766,10 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "softwarePackageName": software_package_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2778,7 +2777,7 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2854,7 +2853,7 @@ def get_software_source(self, software_source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_software_source got unknown kwargs: {extra_kwargs!r}") @@ -2863,10 +2862,10 @@ def get_software_source(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2874,7 +2873,7 @@ def get_software_source(self, software_source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2950,7 +2949,7 @@ def get_windows_update(self, windows_update, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_windows_update got unknown kwargs: {extra_kwargs!r}") @@ -2959,10 +2958,10 @@ def get_windows_update(self, windows_update, **kwargs): "windowsUpdate": windows_update } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2970,7 +2969,7 @@ def get_windows_update(self, windows_update, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3046,7 +3045,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3055,10 +3054,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3066,7 +3065,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3156,7 +3155,7 @@ def install_all_package_updates_on_managed_instance(self, managed_instance_id, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_all_package_updates_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3165,10 +3164,10 @@ def install_all_package_updates_on_managed_instance(self, managed_instance_id, * "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -3181,7 +3180,7 @@ def install_all_package_updates_on_managed_instance(self, managed_instance_id, * query_params = { "updateType": kwargs.get("update_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3189,7 +3188,7 @@ def install_all_package_updates_on_managed_instance(self, managed_instance_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3280,7 +3279,7 @@ def install_all_updates_on_managed_instance_group(self, managed_instance_group_i "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_all_updates_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -3289,10 +3288,10 @@ def install_all_updates_on_managed_instance_group(self, managed_instance_group_i "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -3305,7 +3304,7 @@ def install_all_updates_on_managed_instance_group(self, managed_instance_group_i query_params = { "updateType": kwargs.get("update_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3313,7 +3312,7 @@ def install_all_updates_on_managed_instance_group(self, managed_instance_group_i "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3404,7 +3403,7 @@ def install_all_windows_updates_on_managed_instance(self, managed_instance_id, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_all_windows_updates_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3413,10 +3412,10 @@ def install_all_windows_updates_on_managed_instance(self, managed_instance_id, * "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'update_type' in kwargs: @@ -3429,7 +3428,7 @@ def install_all_windows_updates_on_managed_instance(self, managed_instance_id, * query_params = { "updateType": kwargs.get("update_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3437,7 +3436,7 @@ def install_all_windows_updates_on_managed_instance(self, managed_instance_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3544,7 +3543,7 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "stream_name", "profile_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_module_stream_profile_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3553,10 +3552,10 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3564,7 +3563,7 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "streamName": kwargs.get("stream_name", missing), "profileName": kwargs.get("profile_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3573,7 +3572,7 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3661,7 +3660,7 @@ def install_package_on_managed_instance(self, managed_instance_id, software_pack "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_package_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3670,16 +3669,16 @@ def install_package_on_managed_instance(self, managed_instance_id, software_pack "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "softwarePackageName": software_package_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3687,7 +3686,7 @@ def install_package_on_managed_instance(self, managed_instance_id, software_pack "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3775,7 +3774,7 @@ def install_package_update_on_managed_instance(self, managed_instance_id, softwa "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_package_update_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3784,16 +3783,16 @@ def install_package_update_on_managed_instance(self, managed_instance_id, softwa "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "softwarePackageName": software_package_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3801,7 +3800,7 @@ def install_package_update_on_managed_instance(self, managed_instance_id, softwa "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3891,7 +3890,7 @@ def install_windows_update_on_managed_instance(self, managed_instance_id, window "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_windows_update_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3900,16 +3899,16 @@ def install_windows_update_on_managed_instance(self, managed_instance_id, window "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "windowsUpdateName": windows_update_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3917,7 +3916,7 @@ def install_windows_update_on_managed_instance(self, managed_instance_id, window "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4024,7 +4023,7 @@ def list_available_packages_for_managed_instance(self, managed_instance_id, **kw "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_packages_for_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -4033,10 +4032,10 @@ def list_available_packages_for_managed_instance(self, managed_instance_id, **kw "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4061,14 +4060,14 @@ def list_available_packages_for_managed_instance(self, managed_instance_id, **kw "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4176,7 +4175,7 @@ def list_available_software_sources_for_managed_instance(self, managed_instance_ "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_software_sources_for_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -4185,10 +4184,10 @@ def list_available_software_sources_for_managed_instance(self, managed_instance_ "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4213,14 +4212,14 @@ def list_available_software_sources_for_managed_instance(self, managed_instance_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4328,7 +4327,7 @@ def list_available_updates_for_managed_instance(self, managed_instance_id, **kwa "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_updates_for_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -4337,10 +4336,10 @@ def list_available_updates_for_managed_instance(self, managed_instance_id, **kwa "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4365,14 +4364,14 @@ def list_available_updates_for_managed_instance(self, managed_instance_id, **kwa "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4486,7 +4485,7 @@ def list_available_windows_updates_for_managed_instance(self, managed_instance_i "opc_request_id", "is_eligible_for_installation" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_windows_updates_for_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -4495,10 +4494,10 @@ def list_available_windows_updates_for_managed_instance(self, managed_instance_i "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4531,14 +4530,14 @@ def list_available_windows_updates_for_managed_instance(self, managed_instance_i "sortBy": kwargs.get("sort_by", missing), "isEligibleForInstallation": kwargs.get("is_eligible_for_installation", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4659,7 +4658,7 @@ def list_errata(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_errata got unknown kwargs: {extra_kwargs!r}") @@ -4689,14 +4688,14 @@ def list_errata(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4802,7 +4801,7 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_errata got unknown kwargs: {extra_kwargs!r}") @@ -4811,10 +4810,10 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4839,14 +4838,14 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4962,7 +4961,7 @@ def list_managed_instance_groups(self, compartment_id, **kwargs): "lifecycle_state", "os_family" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_groups got unknown kwargs: {extra_kwargs!r}") @@ -5005,14 +5004,14 @@ def list_managed_instance_groups(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "osFamily": kwargs.get("os_family", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5120,7 +5119,7 @@ def list_managed_instances(self, compartment_id, **kwargs): "opc_request_id", "os_family" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instances got unknown kwargs: {extra_kwargs!r}") @@ -5155,14 +5154,14 @@ def list_managed_instances(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "osFamily": kwargs.get("os_family", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5288,7 +5287,7 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_stream_profiles got unknown kwargs: {extra_kwargs!r}") @@ -5297,10 +5296,10 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5327,14 +5326,14 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5485,7 +5484,7 @@ def list_module_stream_profiles_on_managed_instance(self, managed_instance_id, * "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_stream_profiles_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -5494,10 +5493,10 @@ def list_module_stream_profiles_on_managed_instance(self, managed_instance_id, * "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'profile_status' in kwargs: @@ -5532,14 +5531,14 @@ def list_module_stream_profiles_on_managed_instance(self, managed_instance_id, * "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5667,7 +5666,7 @@ def list_module_streams(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_streams got unknown kwargs: {extra_kwargs!r}") @@ -5676,10 +5675,10 @@ def list_module_streams(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5705,14 +5704,14 @@ def list_module_streams(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5863,7 +5862,7 @@ def list_module_streams_on_managed_instance(self, managed_instance_id, **kwargs) "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_streams_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -5872,10 +5871,10 @@ def list_module_streams_on_managed_instance(self, managed_instance_id, **kwargs) "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'stream_status' in kwargs: @@ -5909,14 +5908,14 @@ def list_module_streams_on_managed_instance(self, managed_instance_id, **kwargs) "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6024,7 +6023,7 @@ def list_packages_installed_on_managed_instance(self, managed_instance_id, **kwa "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_packages_installed_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -6033,10 +6032,10 @@ def list_packages_installed_on_managed_instance(self, managed_instance_id, **kwa "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6061,14 +6060,14 @@ def list_packages_installed_on_managed_instance(self, managed_instance_id, **kwa "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6202,7 +6201,7 @@ def list_scheduled_jobs(self, compartment_id, **kwargs): "os_family", "is_restricted" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scheduled_jobs got unknown kwargs: {extra_kwargs!r}") @@ -6256,14 +6255,14 @@ def list_scheduled_jobs(self, compartment_id, **kwargs): "osFamily": kwargs.get("os_family", missing), "isRestricted": kwargs.get("is_restricted", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6369,7 +6368,7 @@ def list_software_source_packages(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_software_source_packages got unknown kwargs: {extra_kwargs!r}") @@ -6378,10 +6377,10 @@ def list_software_source_packages(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6406,14 +6405,14 @@ def list_software_source_packages(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6523,7 +6522,7 @@ def list_software_sources(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -6558,14 +6557,14 @@ def list_software_sources(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6692,7 +6691,7 @@ def list_upcoming_scheduled_jobs(self, compartment_id, time_end, **kwargs): "opc_request_id", "os_family" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_upcoming_scheduled_jobs got unknown kwargs: {extra_kwargs!r}") @@ -6738,14 +6737,14 @@ def list_upcoming_scheduled_jobs(self, compartment_id, time_end, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "osFamily": kwargs.get("os_family", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6848,7 +6847,7 @@ def list_windows_updates(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_windows_updates got unknown kwargs: {extra_kwargs!r}") @@ -6875,14 +6874,14 @@ def list_windows_updates(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6988,7 +6987,7 @@ def list_windows_updates_installed_on_managed_instance(self, managed_instance_id "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_windows_updates_installed_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -6997,10 +6996,10 @@ def list_windows_updates_installed_on_managed_instance(self, managed_instance_id "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7025,14 +7024,14 @@ def list_windows_updates_installed_on_managed_instance(self, managed_instance_id "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7130,7 +7129,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -7139,10 +7138,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7165,14 +7164,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7270,7 +7269,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -7279,10 +7278,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -7305,14 +7304,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7426,7 +7425,7 @@ def list_work_requests(self, compartment_id, **kwargs): "opc_request_id", "os_family" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -7462,14 +7461,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "osFamily": kwargs.get("os_family", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7623,7 +7622,7 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"manage_module_streams_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -7632,10 +7631,10 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7645,7 +7644,7 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7752,7 +7751,7 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "stream_name", "profile_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_module_stream_profile_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -7761,10 +7760,10 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -7772,7 +7771,7 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "streamName": kwargs.get("stream_name", missing), "profileName": kwargs.get("profile_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7781,7 +7780,7 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7869,7 +7868,7 @@ def remove_package_from_managed_instance(self, managed_instance_id, software_pac "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_package_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -7878,16 +7877,16 @@ def remove_package_from_managed_instance(self, managed_instance_id, software_pac "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "softwarePackageName": software_package_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7895,7 +7894,7 @@ def remove_package_from_managed_instance(self, managed_instance_id, software_pac "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7975,7 +7974,7 @@ def remove_packages_from_software_source(self, software_source_id, remove_packag "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_packages_from_software_source got unknown kwargs: {extra_kwargs!r}") @@ -7984,10 +7983,10 @@ def remove_packages_from_software_source(self, software_source_id, remove_packag "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7995,7 +7994,7 @@ def remove_packages_from_software_source(self, software_source_id, remove_packag "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8088,7 +8087,7 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"run_scheduled_job_now got unknown kwargs: {extra_kwargs!r}") @@ -8097,10 +8096,10 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8110,7 +8109,7 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8218,7 +8217,7 @@ def search_software_packages(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_software_packages got unknown kwargs: {extra_kwargs!r}") @@ -8246,14 +8245,14 @@ def search_software_packages(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8346,7 +8345,7 @@ def skip_next_scheduled_job_execution(self, scheduled_job_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"skip_next_scheduled_job_execution got unknown kwargs: {extra_kwargs!r}") @@ -8355,10 +8354,10 @@ def skip_next_scheduled_job_execution(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8368,7 +8367,7 @@ def skip_next_scheduled_job_execution(self, scheduled_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8470,7 +8469,7 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, module_n "if_match", "stream_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"switch_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -8479,17 +8478,17 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, module_n "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "moduleName": module_name, "streamName": kwargs.get("stream_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -8498,7 +8497,7 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, module_n "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8586,7 +8585,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -8595,10 +8594,10 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8607,7 +8606,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8696,7 +8695,7 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -8705,10 +8704,10 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8717,7 +8716,7 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8806,7 +8805,7 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -8815,10 +8814,10 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8827,7 +8826,7 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8916,7 +8915,7 @@ def update_software_source(self, software_source_id, update_software_source_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_software_source got unknown kwargs: {extra_kwargs!r}") @@ -8925,10 +8924,10 @@ def update_software_source(self, software_source_id, update_software_source_deta "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8937,7 +8936,7 @@ def update_software_source(self, software_source_id, update_software_source_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/lifecycle_environment_client.py b/src/oci/os_management_hub/lifecycle_environment_client.py index df980e9ce6..a94c3811ac 100644 --- a/src/oci/os_management_hub/lifecycle_environment_client.py +++ b/src/oci/os_management_hub/lifecycle_environment_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def attach_managed_instances_to_lifecycle_stage(self, lifecycle_stage_id, attach "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_managed_instances_to_lifecycle_stage got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def attach_managed_instances_to_lifecycle_stage(self, lifecycle_stage_id, attach "lifecycleStageId": lifecycle_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def attach_managed_instances_to_lifecycle_stage(self, lifecycle_stage_id, attach "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -287,7 +286,7 @@ def create_lifecycle_environment(self, create_lifecycle_environment_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_lifecycle_environment got unknown kwargs: {extra_kwargs!r}") @@ -298,7 +297,7 @@ def create_lifecycle_environment(self, create_lifecycle_environment_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -385,7 +384,7 @@ def delete_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_lifecycle_environment got unknown kwargs: {extra_kwargs!r}") @@ -394,10 +393,10 @@ def delete_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "lifecycleEnvironmentId": lifecycle_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -406,7 +405,7 @@ def delete_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -501,7 +500,7 @@ def detach_managed_instances_from_lifecycle_stage(self, lifecycle_stage_id, deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_managed_instances_from_lifecycle_stage got unknown kwargs: {extra_kwargs!r}") @@ -510,10 +509,10 @@ def detach_managed_instances_from_lifecycle_stage(self, lifecycle_stage_id, deta "lifecycleStageId": lifecycle_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -523,7 +522,7 @@ def detach_managed_instances_from_lifecycle_stage(self, lifecycle_stage_id, deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -602,7 +601,7 @@ def get_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lifecycle_environment got unknown kwargs: {extra_kwargs!r}") @@ -611,10 +610,10 @@ def get_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "lifecycleEnvironmentId": lifecycle_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -622,7 +621,7 @@ def get_lifecycle_environment(self, lifecycle_environment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -700,7 +699,7 @@ def get_lifecycle_stage(self, lifecycle_stage_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lifecycle_stage got unknown kwargs: {extra_kwargs!r}") @@ -709,10 +708,10 @@ def get_lifecycle_stage(self, lifecycle_stage_id, **kwargs): "lifecycleStageId": lifecycle_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -720,7 +719,7 @@ def get_lifecycle_stage(self, lifecycle_stage_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -861,7 +860,7 @@ def list_lifecycle_environments(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_lifecycle_environments got unknown kwargs: {extra_kwargs!r}") @@ -914,14 +913,14 @@ def list_lifecycle_environments(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1049,7 +1048,7 @@ def list_lifecycle_stage_installed_packages(self, lifecycle_stage_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_lifecycle_stage_installed_packages got unknown kwargs: {extra_kwargs!r}") @@ -1058,10 +1057,10 @@ def list_lifecycle_stage_installed_packages(self, lifecycle_stage_id, **kwargs): "lifecycleStageId": lifecycle_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -1095,14 +1094,14 @@ def list_lifecycle_stage_installed_packages(self, lifecycle_stage_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1249,7 +1248,7 @@ def list_lifecycle_stages(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_lifecycle_stages got unknown kwargs: {extra_kwargs!r}") @@ -1303,14 +1302,14 @@ def list_lifecycle_stages(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1412,7 +1411,7 @@ def promote_software_source_to_lifecycle_stage(self, lifecycle_stage_id, promote "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"promote_software_source_to_lifecycle_stage got unknown kwargs: {extra_kwargs!r}") @@ -1421,16 +1420,16 @@ def promote_software_source_to_lifecycle_stage(self, lifecycle_stage_id, promote "lifecycleStageId": lifecycle_stage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "softwareSourceId": kwargs.get("software_source_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1439,7 +1438,7 @@ def promote_software_source_to_lifecycle_stage(self, lifecycle_stage_id, promote "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1531,7 +1530,7 @@ def update_lifecycle_environment(self, lifecycle_environment_id, update_lifecycl "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_lifecycle_environment got unknown kwargs: {extra_kwargs!r}") @@ -1540,10 +1539,10 @@ def update_lifecycle_environment(self, lifecycle_environment_id, update_lifecycl "lifecycleEnvironmentId": lifecycle_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1552,7 +1551,7 @@ def update_lifecycle_environment(self, lifecycle_environment_id, update_lifecycl "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/managed_instance_client.py b/src/oci/os_management_hub/managed_instance_client.py index 906a90fff3..402f9028a7 100644 --- a/src/oci/os_management_hub/managed_instance_client.py +++ b/src/oci/os_management_hub/managed_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def attach_software_sources_to_managed_instance(self, managed_instance_id, attac "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_software_sources_to_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def attach_software_sources_to_managed_instance(self, managed_instance_id, attac "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def attach_software_sources_to_managed_instance(self, managed_instance_id, attac "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def detach_software_sources_from_managed_instance(self, managed_instance_id, det "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_software_sources_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def detach_software_sources_from_managed_instance(self, managed_instance_id, det "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -321,7 +320,7 @@ def detach_software_sources_from_managed_instance(self, managed_instance_id, det "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -422,7 +421,7 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, disable "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -431,10 +430,10 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, disable "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -444,7 +443,7 @@ def disable_module_stream_on_managed_instance(self, managed_instance_id, disable "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -546,7 +545,7 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, enable_m "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -555,10 +554,10 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, enable_m "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -568,7 +567,7 @@ def enable_module_stream_on_managed_instance(self, managed_instance_id, enable_m "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -647,7 +646,7 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -656,10 +655,10 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -667,7 +666,7 @@ def get_managed_instance(self, managed_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -766,7 +765,7 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_module_stream_profile_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -775,10 +774,10 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -788,7 +787,7 @@ def install_module_stream_profile_on_managed_instance(self, managed_instance_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -886,7 +885,7 @@ def install_packages_on_managed_instance(self, managed_instance_id, install_pack "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_packages_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -895,10 +894,10 @@ def install_packages_on_managed_instance(self, managed_instance_id, install_pack "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -908,7 +907,7 @@ def install_packages_on_managed_instance(self, managed_instance_id, install_pack "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1029,7 +1028,7 @@ def list_managed_instance_available_packages(self, managed_instance_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_available_packages got unknown kwargs: {extra_kwargs!r}") @@ -1038,10 +1037,10 @@ def list_managed_instance_available_packages(self, managed_instance_id, **kwargs "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1067,14 +1066,14 @@ def list_managed_instance_available_packages(self, managed_instance_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1196,7 +1195,7 @@ def list_managed_instance_available_software_sources(self, managed_instance_id, "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_available_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -1205,10 +1204,10 @@ def list_managed_instance_available_software_sources(self, managed_instance_id, "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1234,14 +1233,14 @@ def list_managed_instance_available_software_sources(self, managed_instance_id, "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1371,7 +1370,7 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_errata got unknown kwargs: {extra_kwargs!r}") @@ -1380,10 +1379,10 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'advisory_type' in kwargs: @@ -1418,14 +1417,14 @@ def list_managed_instance_errata(self, managed_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1559,7 +1558,7 @@ def list_managed_instance_installed_packages(self, managed_instance_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_installed_packages got unknown kwargs: {extra_kwargs!r}") @@ -1568,10 +1567,10 @@ def list_managed_instance_installed_packages(self, managed_instance_id, **kwargs "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1599,14 +1598,14 @@ def list_managed_instance_installed_packages(self, managed_instance_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1739,7 +1738,7 @@ def list_managed_instance_modules(self, managed_instance_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_modules got unknown kwargs: {extra_kwargs!r}") @@ -1748,10 +1747,10 @@ def list_managed_instance_modules(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1777,14 +1776,14 @@ def list_managed_instance_modules(self, managed_instance_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1918,7 +1917,7 @@ def list_managed_instance_updatable_packages(self, managed_instance_id, **kwargs "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_updatable_packages got unknown kwargs: {extra_kwargs!r}") @@ -1927,10 +1926,10 @@ def list_managed_instance_updatable_packages(self, managed_instance_id, **kwargs "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'classification_type' in kwargs: @@ -1966,14 +1965,14 @@ def list_managed_instance_updatable_packages(self, managed_instance_id, **kwargs "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2148,7 +2147,7 @@ def list_managed_instances(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instances got unknown kwargs: {extra_kwargs!r}") @@ -2212,14 +2211,14 @@ def list_managed_instances(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2375,7 +2374,7 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"manage_module_streams_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2384,10 +2383,10 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2397,7 +2396,7 @@ def manage_module_streams_on_managed_instance(self, managed_instance_id, manage_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2492,7 +2491,7 @@ def refresh_software_on_managed_instance(self, managed_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"refresh_software_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2501,10 +2500,10 @@ def refresh_software_on_managed_instance(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2514,7 +2513,7 @@ def refresh_software_on_managed_instance(self, managed_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2612,7 +2611,7 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_module_stream_profile_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2621,10 +2620,10 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2634,7 +2633,7 @@ def remove_module_stream_profile_from_managed_instance(self, managed_instance_id "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2732,7 +2731,7 @@ def remove_packages_from_managed_instance(self, managed_instance_id, remove_pack "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_packages_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2741,10 +2740,10 @@ def remove_packages_from_managed_instance(self, managed_instance_id, remove_pack "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2754,7 +2753,7 @@ def remove_packages_from_managed_instance(self, managed_instance_id, remove_pack "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2855,7 +2854,7 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, switch_m "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"switch_module_stream_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -2864,10 +2863,10 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, switch_m "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2877,7 +2876,7 @@ def switch_module_stream_on_managed_instance(self, managed_instance_id, switch_m "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2972,7 +2971,7 @@ def update_all_packages_on_managed_instances_in_compartment(self, update_all_pac "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_all_packages_on_managed_instances_in_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2984,7 +2983,7 @@ def update_all_packages_on_managed_instances_in_compartment(self, update_all_pac "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3072,7 +3071,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3081,10 +3080,10 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3093,7 +3092,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3192,7 +3191,7 @@ def update_packages_on_managed_instance(self, managed_instance_id, update_packag "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_packages_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3201,10 +3200,10 @@ def update_packages_on_managed_instance(self, managed_instance_id, update_packag "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3214,7 +3213,7 @@ def update_packages_on_managed_instance(self, managed_instance_id, update_packag "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/managed_instance_group_client.py b/src/oci/os_management_hub/managed_instance_group_client.py index 0d27ea8c92..e00c5aa87d 100644 --- a/src/oci/os_management_hub/managed_instance_group_client.py +++ b/src/oci/os_management_hub/managed_instance_group_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -180,7 +179,7 @@ def attach_managed_instances_to_managed_instance_group(self, managed_instance_gr "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_managed_instances_to_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def attach_managed_instances_to_managed_instance_group(self, managed_instance_gr "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -202,7 +201,7 @@ def attach_managed_instances_to_managed_instance_group(self, managed_instance_gr "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -300,7 +299,7 @@ def attach_software_sources_to_managed_instance_group(self, managed_instance_gro "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"attach_software_sources_to_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -309,10 +308,10 @@ def attach_software_sources_to_managed_instance_group(self, managed_instance_gro "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -322,7 +321,7 @@ def attach_software_sources_to_managed_instance_group(self, managed_instance_gro "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -409,7 +408,7 @@ def create_managed_instance_group(self, create_managed_instance_group_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -420,7 +419,7 @@ def create_managed_instance_group(self, create_managed_instance_group_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -507,7 +506,7 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -516,10 +515,10 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -528,7 +527,7 @@ def delete_managed_instance_group(self, managed_instance_group_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -623,7 +622,7 @@ def detach_managed_instances_from_managed_instance_group(self, managed_instance_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_managed_instances_from_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -632,10 +631,10 @@ def detach_managed_instances_from_managed_instance_group(self, managed_instance_ "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -645,7 +644,7 @@ def detach_managed_instances_from_managed_instance_group(self, managed_instance_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -743,7 +742,7 @@ def detach_software_sources_from_managed_instance_group(self, managed_instance_g "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detach_software_sources_from_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -752,10 +751,10 @@ def detach_software_sources_from_managed_instance_group(self, managed_instance_g "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -765,7 +764,7 @@ def detach_software_sources_from_managed_instance_group(self, managed_instance_g "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -866,7 +865,7 @@ def disable_module_stream_on_managed_instance_group(self, managed_instance_group "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_module_stream_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -875,10 +874,10 @@ def disable_module_stream_on_managed_instance_group(self, managed_instance_group "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -888,7 +887,7 @@ def disable_module_stream_on_managed_instance_group(self, managed_instance_group "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -990,7 +989,7 @@ def enable_module_stream_on_managed_instance_group(self, managed_instance_group_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_module_stream_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -999,10 +998,10 @@ def enable_module_stream_on_managed_instance_group(self, managed_instance_group_ "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1012,7 +1011,7 @@ def enable_module_stream_on_managed_instance_group(self, managed_instance_group_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1091,7 +1090,7 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1100,10 +1099,10 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1111,7 +1110,7 @@ def get_managed_instance_group(self, managed_instance_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1210,7 +1209,7 @@ def install_module_stream_profile_on_managed_instance_group(self, managed_instan "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_module_stream_profile_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1219,10 +1218,10 @@ def install_module_stream_profile_on_managed_instance_group(self, managed_instan "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1232,7 +1231,7 @@ def install_module_stream_profile_on_managed_instance_group(self, managed_instan "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1331,7 +1330,7 @@ def install_packages_on_managed_instance_group(self, managed_instance_group_id, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"install_packages_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1340,10 +1339,10 @@ def install_packages_on_managed_instance_group(self, managed_instance_group_id, "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1353,7 +1352,7 @@ def install_packages_on_managed_instance_group(self, managed_instance_group_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1475,7 +1474,7 @@ def list_managed_instance_group_available_modules(self, managed_instance_group_i "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_group_available_modules got unknown kwargs: {extra_kwargs!r}") @@ -1484,10 +1483,10 @@ def list_managed_instance_group_available_modules(self, managed_instance_group_i "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1513,14 +1512,14 @@ def list_managed_instance_group_available_modules(self, managed_instance_group_i "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1649,7 +1648,7 @@ def list_managed_instance_group_available_packages(self, managed_instance_group_ "is_latest", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_group_available_packages got unknown kwargs: {extra_kwargs!r}") @@ -1658,10 +1657,10 @@ def list_managed_instance_group_available_packages(self, managed_instance_group_ "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1688,14 +1687,14 @@ def list_managed_instance_group_available_packages(self, managed_instance_group_ "sortBy": kwargs.get("sort_by", missing), "isLatest": kwargs.get("is_latest", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1818,7 +1817,7 @@ def list_managed_instance_group_available_software_sources(self, managed_instanc "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_group_available_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -1827,10 +1826,10 @@ def list_managed_instance_group_available_software_sources(self, managed_instanc "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1856,14 +1855,14 @@ def list_managed_instance_group_available_software_sources(self, managed_instanc "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1998,7 +1997,7 @@ def list_managed_instance_group_installed_packages(self, managed_instance_group_ "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_group_installed_packages got unknown kwargs: {extra_kwargs!r}") @@ -2007,10 +2006,10 @@ def list_managed_instance_group_installed_packages(self, managed_instance_group_ "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2038,14 +2037,14 @@ def list_managed_instance_group_installed_packages(self, managed_instance_group_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2192,7 +2191,7 @@ def list_managed_instance_group_modules(self, managed_instance_group_id, **kwarg "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_group_modules got unknown kwargs: {extra_kwargs!r}") @@ -2201,10 +2200,10 @@ def list_managed_instance_group_modules(self, managed_instance_group_id, **kwarg "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2231,14 +2230,14 @@ def list_managed_instance_group_modules(self, managed_instance_group_id, **kwarg "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2384,7 +2383,7 @@ def list_managed_instance_groups(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_managed_instance_groups got unknown kwargs: {extra_kwargs!r}") @@ -2438,14 +2437,14 @@ def list_managed_instance_groups(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2601,7 +2600,7 @@ def manage_module_streams_on_managed_instance_group(self, managed_instance_group "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"manage_module_streams_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2610,10 +2609,10 @@ def manage_module_streams_on_managed_instance_group(self, managed_instance_group "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2623,7 +2622,7 @@ def manage_module_streams_on_managed_instance_group(self, managed_instance_group "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2723,7 +2722,7 @@ def remove_module_stream_profile_from_managed_instance_group(self, managed_insta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_module_stream_profile_from_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2732,10 +2731,10 @@ def remove_module_stream_profile_from_managed_instance_group(self, managed_insta "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2745,7 +2744,7 @@ def remove_module_stream_profile_from_managed_instance_group(self, managed_insta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2843,7 +2842,7 @@ def remove_packages_from_managed_instance_group(self, managed_instance_group_id, "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_packages_from_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2852,10 +2851,10 @@ def remove_packages_from_managed_instance_group(self, managed_instance_group_id, "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2865,7 +2864,7 @@ def remove_packages_from_managed_instance_group(self, managed_instance_group_id, "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2963,7 +2962,7 @@ def update_all_packages_on_managed_instance_group(self, managed_instance_group_i "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_all_packages_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2972,10 +2971,10 @@ def update_all_packages_on_managed_instance_group(self, managed_instance_group_i "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2985,7 +2984,7 @@ def update_all_packages_on_managed_instance_group(self, managed_instance_group_i "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3075,7 +3074,7 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -3084,10 +3083,10 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "managedInstanceGroupId": managed_instance_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3096,7 +3095,7 @@ def update_managed_instance_group(self, managed_instance_group_id, update_manage "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/management_station_client.py b/src/oci/os_management_hub/management_station_client.py index d33987b5fd..c11d320828 100644 --- a/src/oci/os_management_hub/management_station_client.py +++ b/src/oci/os_management_hub/management_station_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_management_station(self, create_management_station_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_management_station got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_management_station(self, create_management_station_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -264,7 +263,7 @@ def delete_management_station(self, management_station_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_management_station got unknown kwargs: {extra_kwargs!r}") @@ -273,10 +272,10 @@ def delete_management_station(self, management_station_id, **kwargs): "managementStationId": management_station_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -285,7 +284,7 @@ def delete_management_station(self, management_station_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -361,7 +360,7 @@ def get_management_station(self, management_station_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_management_station got unknown kwargs: {extra_kwargs!r}") @@ -370,10 +369,10 @@ def get_management_station(self, management_station_id, **kwargs): "managementStationId": management_station_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -381,7 +380,7 @@ def get_management_station(self, management_station_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -514,7 +513,7 @@ def list_management_stations(self, **kwargs): "opc_request_id", "id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_management_stations got unknown kwargs: {extra_kwargs!r}") @@ -552,14 +551,14 @@ def list_management_stations(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -683,7 +682,7 @@ def list_mirrors(self, management_station_id, **kwargs): "mirror_states", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_mirrors got unknown kwargs: {extra_kwargs!r}") @@ -692,10 +691,10 @@ def list_mirrors(self, management_station_id, **kwargs): "managementStationId": management_station_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -729,14 +728,14 @@ def list_mirrors(self, management_station_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "mirrorStates": self.base_client.generate_collection_format_param(kwargs.get("mirror_states", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -835,7 +834,7 @@ def synchronize_mirrors(self, management_station_id, synchronize_mirrors_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"synchronize_mirrors got unknown kwargs: {extra_kwargs!r}") @@ -844,10 +843,10 @@ def synchronize_mirrors(self, management_station_id, synchronize_mirrors_details "managementStationId": management_station_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -857,7 +856,7 @@ def synchronize_mirrors(self, management_station_id, synchronize_mirrors_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -955,7 +954,7 @@ def synchronize_single_mirrors(self, management_station_id, mirror_id, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"synchronize_single_mirrors got unknown kwargs: {extra_kwargs!r}") @@ -965,10 +964,10 @@ def synchronize_single_mirrors(self, management_station_id, mirror_id, **kwargs) "mirrorId": mirror_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -978,7 +977,7 @@ def synchronize_single_mirrors(self, management_station_id, mirror_id, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1066,7 +1065,7 @@ def update_management_station(self, management_station_id, update_management_sta "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_management_station got unknown kwargs: {extra_kwargs!r}") @@ -1075,10 +1074,10 @@ def update_management_station(self, management_station_id, update_management_sta "managementStationId": management_station_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1087,7 +1086,7 @@ def update_management_station(self, management_station_id, update_management_sta "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/onboarding_client.py b/src/oci/os_management_hub/onboarding_client.py index 23efb60e3d..52e0b96b7d 100644 --- a/src/oci/os_management_hub/onboarding_client.py +++ b/src/oci/os_management_hub/onboarding_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def create_profile(self, create_profile_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_profile got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def create_profile(self, create_profile_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -266,7 +265,7 @@ def delete_profile(self, profile_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_profile got unknown kwargs: {extra_kwargs!r}") @@ -275,10 +274,10 @@ def delete_profile(self, profile_id, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -287,7 +286,7 @@ def delete_profile(self, profile_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -363,7 +362,7 @@ def get_profile(self, profile_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_profile got unknown kwargs: {extra_kwargs!r}") @@ -372,10 +371,10 @@ def get_profile(self, profile_id, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -383,7 +382,7 @@ def get_profile(self, profile_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -537,7 +536,7 @@ def list_profiles(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_profiles got unknown kwargs: {extra_kwargs!r}") @@ -607,14 +606,14 @@ def list_profiles(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -703,7 +702,7 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_profile got unknown kwargs: {extra_kwargs!r}") @@ -712,10 +711,10 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "profileId": profile_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -724,7 +723,7 @@ def update_profile(self, profile_id, update_profile_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/reporting_managed_instance_client.py b/src/oci/os_management_hub/reporting_managed_instance_client.py index 9e77f06b33..f1709cbb55 100644 --- a/src/oci/os_management_hub/reporting_managed_instance_client.py +++ b/src/oci/os_management_hub/reporting_managed_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -208,7 +207,7 @@ def get_managed_instance_analytic_content(self, **kwargs): "bug_updates_available_greater_than", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance_analytic_content got unknown kwargs: {extra_kwargs!r}") @@ -242,14 +241,14 @@ def get_managed_instance_analytic_content(self, **kwargs): "securityUpdatesAvailableGreaterThan": kwargs.get("security_updates_available_greater_than", missing), "bugUpdatesAvailableGreaterThan": kwargs.get("bug_updates_available_greater_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/x-yaml", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -343,7 +342,7 @@ def get_managed_instance_content(self, managed_instance_id, **kwargs): "advisory_type", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_managed_instance_content got unknown kwargs: {extra_kwargs!r}") @@ -352,10 +351,10 @@ def get_managed_instance_content(self, managed_instance_id, **kwargs): "managedInstanceId": managed_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'advisory_type' in kwargs: @@ -371,14 +370,14 @@ def get_managed_instance_content(self, managed_instance_id, **kwargs): "advisoryNameContains": kwargs.get("advisory_name_contains", missing), "advisoryType": self.base_client.generate_collection_format_param(kwargs.get("advisory_type", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/x-yaml", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -527,7 +526,7 @@ def summarize_managed_instance_analytics(self, metric_names, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_managed_instance_analytics got unknown kwargs: {extra_kwargs!r}") @@ -583,14 +582,14 @@ def summarize_managed_instance_analytics(self, metric_names, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/scheduled_job_client.py b/src/oci/os_management_hub/scheduled_job_client.py index 9d1b082453..08e47ba01c 100644 --- a/src/oci/os_management_hub/scheduled_job_client.py +++ b/src/oci/os_management_hub/scheduled_job_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_scheduled_job(self, create_scheduled_job_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_scheduled_job(self, create_scheduled_job_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -264,7 +263,7 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -273,10 +272,10 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -285,7 +284,7 @@ def delete_scheduled_job(self, scheduled_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -361,7 +360,7 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -370,10 +369,10 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -381,7 +380,7 @@ def get_scheduled_job(self, scheduled_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -560,7 +559,7 @@ def list_scheduled_jobs(self, **kwargs): "id", "compartment_id_in_subtree" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scheduled_jobs got unknown kwargs: {extra_kwargs!r}") @@ -621,14 +620,14 @@ def list_scheduled_jobs(self, **kwargs): "id": kwargs.get("id", missing), "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -723,7 +722,7 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"run_scheduled_job_now got unknown kwargs: {extra_kwargs!r}") @@ -732,10 +731,10 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -745,7 +744,7 @@ def run_scheduled_job_now(self, scheduled_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -833,7 +832,7 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_scheduled_job got unknown kwargs: {extra_kwargs!r}") @@ -842,10 +841,10 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "scheduledJobId": scheduled_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -854,7 +853,7 @@ def update_scheduled_job(self, scheduled_job_id, update_scheduled_job_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/software_source_client.py b/src/oci/os_management_hub/software_source_client.py index 8288eb8f5d..e2f31664bf 100644 --- a/src/oci/os_management_hub/software_source_client.py +++ b/src/oci/os_management_hub/software_source_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def change_availability_of_software_sources(self, change_availability_of_softwar "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_availability_of_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def change_availability_of_software_sources(self, change_availability_of_softwar "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def create_entitlement(self, create_entitlement_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -273,7 +272,7 @@ def create_entitlement(self, create_entitlement_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -358,7 +357,7 @@ def create_software_source(self, create_software_source_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_software_source got unknown kwargs: {extra_kwargs!r}") @@ -369,7 +368,7 @@ def create_software_source(self, create_software_source_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -456,7 +455,7 @@ def delete_software_source(self, software_source_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_software_source got unknown kwargs: {extra_kwargs!r}") @@ -465,10 +464,10 @@ def delete_software_source(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -477,7 +476,7 @@ def delete_software_source(self, software_source_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -556,7 +555,7 @@ def get_erratum(self, compartment_id, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_erratum got unknown kwargs: {extra_kwargs!r}") @@ -565,23 +564,23 @@ def get_erratum(self, compartment_id, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -667,7 +666,7 @@ def get_module_stream(self, software_source_id, module_name, stream_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_module_stream got unknown kwargs: {extra_kwargs!r}") @@ -677,23 +676,23 @@ def get_module_stream(self, software_source_id, module_name, stream_name, **kwar "moduleName": module_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "streamName": stream_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -782,7 +781,7 @@ def get_module_stream_profile(self, software_source_id, profile_name, module_nam "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_module_stream_profile got unknown kwargs: {extra_kwargs!r}") @@ -792,24 +791,24 @@ def get_module_stream_profile(self, software_source_id, profile_name, module_nam "profileName": profile_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "moduleName": module_name, "streamName": stream_name } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -892,7 +891,7 @@ def get_package_group(self, software_source_id, package_group_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_package_group got unknown kwargs: {extra_kwargs!r}") @@ -902,10 +901,10 @@ def get_package_group(self, software_source_id, package_group_id, **kwargs): "packageGroupId": package_group_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -913,7 +912,7 @@ def get_package_group(self, software_source_id, package_group_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -994,7 +993,7 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_software_package got unknown kwargs: {extra_kwargs!r}") @@ -1004,10 +1003,10 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "softwarePackageName": software_package_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1015,7 +1014,7 @@ def get_software_package(self, software_source_id, software_package_name, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1093,7 +1092,7 @@ def get_software_source(self, software_source_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_software_source got unknown kwargs: {extra_kwargs!r}") @@ -1102,10 +1101,10 @@ def get_software_source(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1113,7 +1112,7 @@ def get_software_source(self, software_source_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1232,7 +1231,7 @@ def list_entitlements(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_entitlements got unknown kwargs: {extra_kwargs!r}") @@ -1267,14 +1266,14 @@ def list_entitlements(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1423,7 +1422,7 @@ def list_errata(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_errata got unknown kwargs: {extra_kwargs!r}") @@ -1479,14 +1478,14 @@ def list_errata(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1609,7 +1608,7 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_stream_profiles got unknown kwargs: {extra_kwargs!r}") @@ -1618,10 +1617,10 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1647,14 +1646,14 @@ def list_module_stream_profiles(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1784,7 +1783,7 @@ def list_module_streams(self, software_source_id, **kwargs): "module_name_contains", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_module_streams got unknown kwargs: {extra_kwargs!r}") @@ -1793,10 +1792,10 @@ def list_module_streams(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1823,14 +1822,14 @@ def list_module_streams(self, software_source_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "moduleNameContains": kwargs.get("module_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1957,7 +1956,7 @@ def list_package_groups(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_package_groups got unknown kwargs: {extra_kwargs!r}") @@ -1966,10 +1965,10 @@ def list_package_groups(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1996,14 +1995,14 @@ def list_package_groups(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2130,7 +2129,7 @@ def list_software_packages(self, software_source_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_software_packages got unknown kwargs: {extra_kwargs!r}") @@ -2139,10 +2138,10 @@ def list_software_packages(self, software_source_id, **kwargs): "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -2168,14 +2167,14 @@ def list_software_packages(self, software_source_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2272,7 +2271,7 @@ def list_software_source_vendors(self, compartment_id, **kwargs): "sort_by", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_software_source_vendors got unknown kwargs: {extra_kwargs!r}") @@ -2297,14 +2296,14 @@ def list_software_source_vendors(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2466,7 +2465,7 @@ def list_software_sources(self, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -2541,14 +2540,14 @@ def list_software_sources(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lifecycleState": self.base_client.generate_collection_format_param(kwargs.get("lifecycle_state", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2645,7 +2644,7 @@ def search_software_source_module_streams(self, search_software_source_module_st "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_software_source_module_streams got unknown kwargs: {extra_kwargs!r}") @@ -2654,14 +2653,14 @@ def search_software_source_module_streams(self, search_software_source_module_st "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2760,7 +2759,7 @@ def search_software_source_modules(self, search_software_source_modules_details, "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_software_source_modules got unknown kwargs: {extra_kwargs!r}") @@ -2769,14 +2768,14 @@ def search_software_source_modules(self, search_software_source_modules_details, "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2875,7 +2874,7 @@ def search_software_source_package_groups(self, search_software_source_package_g "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_software_source_package_groups got unknown kwargs: {extra_kwargs!r}") @@ -2884,14 +2883,14 @@ def search_software_source_package_groups(self, search_software_source_package_g "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2982,7 +2981,7 @@ def update_software_source(self, software_source_id, update_software_source_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_software_source got unknown kwargs: {extra_kwargs!r}") @@ -2991,10 +2990,10 @@ def update_software_source(self, software_source_id, update_software_source_deta "softwareSourceId": software_source_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3003,7 +3002,7 @@ def update_software_source(self, software_source_id, update_software_source_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/os_management_hub/work_request_client.py b/src/oci/os_management_hub/work_request_client.py index ae503e4481..a6770dca7c 100644 --- a/src/oci/os_management_hub/work_request_client.py +++ b/src/oci/os_management_hub/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -158,7 +157,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -167,10 +166,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -178,7 +177,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -287,7 +286,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -322,14 +321,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -440,7 +439,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -449,10 +448,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -475,14 +474,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -631,7 +630,7 @@ def list_work_requests(self, **kwargs): "operation_type", "display_name_contains" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -681,14 +680,14 @@ def list_work_requests(self, **kwargs): "operationType": self.base_client.generate_collection_format_param(kwargs.get("operation_type", missing), 'multi'), "displayNameContains": kwargs.get("display_name_contains", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osp_gateway/address_rule_service_client.py b/src/oci/osp_gateway/address_rule_service_client.py index 1c75bfb5df..1ecffdd9a3 100644 --- a/src/oci/osp_gateway/address_rule_service_client.py +++ b/src/oci/osp_gateway/address_rule_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def get_address_rule(self, osp_home_region, compartment_id, country_code, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_address_rule got unknown kwargs: {extra_kwargs!r}") @@ -176,24 +175,24 @@ def get_address_rule(self, osp_home_region, compartment_id, country_code, **kwar "countryCode": country_code } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osp_gateway/address_service_client.py b/src/oci/osp_gateway/address_service_client.py index 9b3d949a89..268ded9527 100644 --- a/src/oci/osp_gateway/address_service_client.py +++ b/src/oci/osp_gateway/address_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def get_address(self, osp_home_region, compartment_id, address_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_address got unknown kwargs: {extra_kwargs!r}") @@ -176,24 +175,24 @@ def get_address(self, osp_home_region, compartment_id, address_id, **kwargs): "addressId": address_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -295,7 +294,7 @@ def verify_address(self, osp_home_region, compartment_id, verify_address_details "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"verify_address got unknown kwargs: {extra_kwargs!r}") @@ -304,7 +303,7 @@ def verify_address(self, osp_home_region, compartment_id, verify_address_details "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -313,7 +312,7 @@ def verify_address(self, osp_home_region, compartment_id, verify_address_details "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osp_gateway/invoice_service_client.py b/src/oci/osp_gateway/invoice_service_client.py index dba2c6df6e..2b6c1c5b81 100644 --- a/src/oci/osp_gateway/invoice_service_client.py +++ b/src/oci/osp_gateway/invoice_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def download_pdf_content(self, osp_home_region, compartment_id, internal_invoice "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"download_pdf_content got unknown kwargs: {extra_kwargs!r}") @@ -176,24 +175,24 @@ def download_pdf_content(self, osp_home_region, compartment_id, internal_invoice "internalInvoiceId": internal_invoice_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/pdf", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -282,7 +281,7 @@ def get_invoice(self, osp_home_region, compartment_id, internal_invoice_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_invoice got unknown kwargs: {extra_kwargs!r}") @@ -291,24 +290,24 @@ def get_invoice(self, osp_home_region, compartment_id, internal_invoice_id, **kw "internalInvoiceId": internal_invoice_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -405,7 +404,7 @@ def list_invoice_lines(self, osp_home_region, compartment_id, internal_invoice_i "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_invoice_lines got unknown kwargs: {extra_kwargs!r}") @@ -414,10 +413,10 @@ def list_invoice_lines(self, osp_home_region, compartment_id, internal_invoice_i "internalInvoiceId": internal_invoice_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -426,14 +425,14 @@ def list_invoice_lines(self, osp_home_region, compartment_id, internal_invoice_i "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -578,7 +577,7 @@ def list_invoices(self, osp_home_region, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_invoices got unknown kwargs: {extra_kwargs!r}") @@ -629,14 +628,14 @@ def list_invoices(self, osp_home_region, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -739,7 +738,7 @@ def pay_invoice(self, osp_home_region, internal_invoice_id, compartment_id, pay_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"pay_invoice got unknown kwargs: {extra_kwargs!r}") @@ -748,17 +747,17 @@ def pay_invoice(self, osp_home_region, internal_invoice_id, compartment_id, pay_ "internalInvoiceId": internal_invoice_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -767,7 +766,7 @@ def pay_invoice(self, osp_home_region, internal_invoice_id, compartment_id, pay_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osp_gateway/subscription_service_client.py b/src/oci/osp_gateway/subscription_service_client.py index 2add40e78e..1fce0815f8 100644 --- a/src/oci/osp_gateway/subscription_service_client.py +++ b/src/oci/osp_gateway/subscription_service_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -183,7 +182,7 @@ def authorize_subscription_payment(self, osp_home_region, subscription_id, compa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"authorize_subscription_payment got unknown kwargs: {extra_kwargs!r}") @@ -192,17 +191,17 @@ def authorize_subscription_payment(self, osp_home_region, subscription_id, compa "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -211,7 +210,7 @@ def authorize_subscription_payment(self, osp_home_region, subscription_id, compa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -303,7 +302,7 @@ def get_subscription(self, subscription_id, osp_home_region, compartment_id, **k "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscription got unknown kwargs: {extra_kwargs!r}") @@ -312,24 +311,24 @@ def get_subscription(self, subscription_id, osp_home_region, compartment_id, **k "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -435,7 +434,7 @@ def list_subscriptions(self, osp_home_region, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -462,14 +461,14 @@ def list_subscriptions(self, osp_home_region, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -572,7 +571,7 @@ def pay_subscription(self, osp_home_region, subscription_id, compartment_id, pay "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"pay_subscription got unknown kwargs: {extra_kwargs!r}") @@ -581,17 +580,17 @@ def pay_subscription(self, osp_home_region, subscription_id, compartment_id, pay "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -600,7 +599,7 @@ def pay_subscription(self, osp_home_region, subscription_id, compartment_id, pay "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -703,7 +702,7 @@ def update_subscription(self, subscription_id, osp_home_region, compartment_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_subscription got unknown kwargs: {extra_kwargs!r}") @@ -712,17 +711,17 @@ def update_subscription(self, subscription_id, osp_home_region, compartment_id, "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ospHomeRegion": osp_home_region, "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -730,7 +729,7 @@ def update_subscription(self, subscription_id, osp_home_region, compartment_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_billing_schedule/billing_schedule_client.py b/src/oci/osub_billing_schedule/billing_schedule_client.py index 3a159e2410..d761dc0111 100644 --- a/src/oci/osub_billing_schedule/billing_schedule_client.py +++ b/src/oci/osub_billing_schedule/billing_schedule_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -192,7 +191,7 @@ def list_billing_schedules(self, compartment_id, subscription_id, **kwargs): "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_billing_schedules got unknown kwargs: {extra_kwargs!r}") @@ -220,7 +219,7 @@ def list_billing_schedules(self, compartment_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -228,7 +227,7 @@ def list_billing_schedules(self, compartment_id, subscription_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_organization_subscription/organization_subscription_client.py b/src/oci/osub_organization_subscription/organization_subscription_client.py index 5f5d57a321..61f817e2cc 100644 --- a/src/oci/osub_organization_subscription/organization_subscription_client.py +++ b/src/oci/osub_organization_subscription/organization_subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -187,7 +186,7 @@ def list_organization_subscriptions(self, compartment_id, subscription_ids, **kw "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_organization_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -214,7 +213,7 @@ def list_organization_subscriptions(self, compartment_id, subscription_ids, **kw "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -222,7 +221,7 @@ def list_organization_subscriptions(self, compartment_id, subscription_ids, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_subscription/commitment_client.py b/src/oci/osub_subscription/commitment_client.py index e3b6ed15c9..2f2c4eb32c 100644 --- a/src/oci/osub_subscription/commitment_client.py +++ b/src/oci/osub_subscription/commitment_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def get_commitment(self, commitment_id, **kwargs): "x_one_gateway_subscription_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_commitment got unknown kwargs: {extra_kwargs!r}") @@ -176,10 +175,10 @@ def get_commitment(self, commitment_id, **kwargs): "commitmentId": commitment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def get_commitment(self, commitment_id, **kwargs): "x-one-gateway-subscription-id": kwargs.get("x_one_gateway_subscription_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -299,7 +298,7 @@ def list_commitments(self, subscribed_service_id, compartment_id, **kwargs): "x_one_gateway_subscription_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_commitments got unknown kwargs: {extra_kwargs!r}") @@ -326,7 +325,7 @@ def list_commitments(self, subscribed_service_id, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -335,7 +334,7 @@ def list_commitments(self, subscribed_service_id, compartment_id, **kwargs): "x-one-gateway-subscription-id": kwargs.get("x_one_gateway_subscription_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_subscription/ratecard_client.py b/src/oci/osub_subscription/ratecard_client.py index ecf8f89ac8..5c138e0f7d 100644 --- a/src/oci/osub_subscription/ratecard_client.py +++ b/src/oci/osub_subscription/ratecard_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -200,7 +199,7 @@ def list_rate_cards(self, subscription_id, compartment_id, **kwargs): "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rate_cards got unknown kwargs: {extra_kwargs!r}") @@ -230,7 +229,7 @@ def list_rate_cards(self, subscription_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -238,7 +237,7 @@ def list_rate_cards(self, subscription_id, compartment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_subscription/subscription_client.py b/src/oci/osub_subscription/subscription_client.py index 9eb1a65a40..27fd22a9f5 100644 --- a/src/oci/osub_subscription/subscription_client.py +++ b/src/oci/osub_subscription/subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -208,7 +207,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "x_one_gateway_subscription_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -238,7 +237,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -247,7 +246,7 @@ def list_subscriptions(self, compartment_id, **kwargs): "x-one-gateway-subscription-id": kwargs.get("x_one_gateway_subscription_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/osub_usage/computed_usage_client.py b/src/oci/osub_usage/computed_usage_client.py index d7887858f5..869b2bcaf2 100644 --- a/src/oci/osub_usage/computed_usage_client.py +++ b/src/oci/osub_usage/computed_usage_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def get_computed_usage(self, computed_usage_id, compartment_id, **kwargs): "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_computed_usage got unknown kwargs: {extra_kwargs!r}") @@ -181,17 +180,17 @@ def get_computed_usage(self, computed_usage_id, compartment_id, **kwargs): "computedUsageId": computed_usage_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id, "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -199,7 +198,7 @@ def get_computed_usage(self, computed_usage_id, compartment_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -310,7 +309,7 @@ def list_computed_usage_aggregateds(self, compartment_id, subscription_id, time_ "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_computed_usage_aggregateds got unknown kwargs: {extra_kwargs!r}") @@ -332,7 +331,7 @@ def list_computed_usage_aggregateds(self, compartment_id, subscription_id, time_ "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -340,7 +339,7 @@ def list_computed_usage_aggregateds(self, compartment_id, subscription_id, time_ "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -459,7 +458,7 @@ def list_computed_usages(self, compartment_id, subscription_id, time_from, time_ "opc_request_id", "x_one_origin_region" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_computed_usages got unknown kwargs: {extra_kwargs!r}") @@ -490,7 +489,7 @@ def list_computed_usages(self, compartment_id, subscription_id, time_from, time_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -498,7 +497,7 @@ def list_computed_usages(self, compartment_id, subscription_id, time_from, time_ "opc-request-id": kwargs.get("opc_request_id", missing), "x-one-origin-region": kwargs.get("x_one_origin_region", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/psql/postgresql_client.py b/src/oci/psql/postgresql_client.py index b34349882a..65299bc848 100644 --- a/src/oci/psql/postgresql_client.py +++ b/src/oci/psql/postgresql_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def change_backup_compartment(self, backup_id, change_backup_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -290,7 +289,7 @@ def change_configuration_compartment(self, configuration_id, change_configuratio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -299,10 +298,10 @@ def change_configuration_compartment(self, configuration_id, change_configuratio "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -312,7 +311,7 @@ def change_configuration_compartment(self, configuration_id, change_configuratio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -406,7 +405,7 @@ def change_db_system_compartment(self, db_system_id, change_db_system_compartmen "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_db_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -415,10 +414,10 @@ def change_db_system_compartment(self, db_system_id, change_db_system_compartmen "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -428,7 +427,7 @@ def change_db_system_compartment(self, db_system_id, change_db_system_compartmen "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -514,7 +513,7 @@ def create_backup(self, create_backup_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_backup got unknown kwargs: {extra_kwargs!r}") @@ -525,7 +524,7 @@ def create_backup(self, create_backup_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -609,7 +608,7 @@ def create_configuration(self, create_configuration_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_configuration got unknown kwargs: {extra_kwargs!r}") @@ -620,7 +619,7 @@ def create_configuration(self, create_configuration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -706,7 +705,7 @@ def create_db_system(self, create_db_system_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_db_system got unknown kwargs: {extra_kwargs!r}") @@ -717,7 +716,7 @@ def create_db_system(self, create_db_system_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -801,7 +800,7 @@ def delete_backup(self, backup_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_backup got unknown kwargs: {extra_kwargs!r}") @@ -810,10 +809,10 @@ def delete_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -822,7 +821,7 @@ def delete_backup(self, backup_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -903,7 +902,7 @@ def delete_configuration(self, configuration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_configuration got unknown kwargs: {extra_kwargs!r}") @@ -912,10 +911,10 @@ def delete_configuration(self, configuration_id, **kwargs): "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -924,7 +923,7 @@ def delete_configuration(self, configuration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1005,7 +1004,7 @@ def delete_db_system(self, db_system_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1014,10 +1013,10 @@ def delete_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1026,7 +1025,7 @@ def delete_db_system(self, db_system_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1117,7 +1116,7 @@ def failover_db_system(self, db_system_id, failover_db_system_details, **kwargs) "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"failover_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1126,10 +1125,10 @@ def failover_db_system(self, db_system_id, failover_db_system_details, **kwargs) "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1139,7 +1138,7 @@ def failover_db_system(self, db_system_id, failover_db_system_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1218,7 +1217,7 @@ def get_backup(self, backup_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_backup got unknown kwargs: {extra_kwargs!r}") @@ -1227,10 +1226,10 @@ def get_backup(self, backup_id, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1238,7 +1237,7 @@ def get_backup(self, backup_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1316,7 +1315,7 @@ def get_configuration(self, configuration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1325,10 +1324,10 @@ def get_configuration(self, configuration_id, **kwargs): "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1336,7 +1335,7 @@ def get_configuration(self, configuration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1414,7 +1413,7 @@ def get_connection_details(self, db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connection_details got unknown kwargs: {extra_kwargs!r}") @@ -1423,10 +1422,10 @@ def get_connection_details(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1434,7 +1433,7 @@ def get_connection_details(self, db_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1518,7 +1517,7 @@ def get_db_system(self, db_system_id, **kwargs): "opc_request_id", "excluded_fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_db_system got unknown kwargs: {extra_kwargs!r}") @@ -1527,10 +1526,10 @@ def get_db_system(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'excluded_fields' in kwargs: @@ -1544,14 +1543,14 @@ def get_db_system(self, db_system_id, **kwargs): query_params = { "excludedFields": self.base_client.generate_collection_format_param(kwargs.get("excluded_fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1631,7 +1630,7 @@ def get_default_configuration(self, default_configuration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_default_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1640,10 +1639,10 @@ def get_default_configuration(self, default_configuration_id, **kwargs): "defaultConfigurationId": default_configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1651,7 +1650,7 @@ def get_default_configuration(self, default_configuration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1729,7 +1728,7 @@ def get_primary_db_instance(self, db_system_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_primary_db_instance got unknown kwargs: {extra_kwargs!r}") @@ -1738,10 +1737,10 @@ def get_primary_db_instance(self, db_system_id, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1749,7 +1748,7 @@ def get_primary_db_instance(self, db_system_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1827,7 +1826,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1836,10 +1835,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1847,7 +1846,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1976,7 +1975,7 @@ def list_backups(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_backups got unknown kwargs: {extra_kwargs!r}") @@ -2015,14 +2014,14 @@ def list_backups(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2144,7 +2143,7 @@ def list_configurations(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2182,14 +2181,14 @@ def list_configurations(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2302,7 +2301,7 @@ def list_db_systems(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_db_systems got unknown kwargs: {extra_kwargs!r}") @@ -2338,14 +2337,14 @@ def list_db_systems(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2463,7 +2462,7 @@ def list_default_configurations(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_default_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2500,14 +2499,14 @@ def list_default_configurations(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2610,7 +2609,7 @@ def list_shapes(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shapes got unknown kwargs: {extra_kwargs!r}") @@ -2637,14 +2636,14 @@ def list_shapes(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2742,7 +2741,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2751,10 +2750,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2777,14 +2776,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2884,7 +2883,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2893,10 +2892,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2919,14 +2918,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3041,7 +3040,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -3077,14 +3076,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3170,7 +3169,7 @@ def patch_db_system(self, db_system_id, patch_db_system_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"patch_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3179,10 +3178,10 @@ def patch_db_system(self, db_system_id, patch_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3191,7 +3190,7 @@ def patch_db_system(self, db_system_id, patch_db_system_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3284,7 +3283,7 @@ def reset_master_user_password(self, db_system_id, reset_master_user_password_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reset_master_user_password got unknown kwargs: {extra_kwargs!r}") @@ -3293,10 +3292,10 @@ def reset_master_user_password(self, db_system_id, reset_master_user_password_de "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3306,7 +3305,7 @@ def reset_master_user_password(self, db_system_id, reset_master_user_password_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3400,7 +3399,7 @@ def restart_db_instance_in_db_system(self, db_system_id, restart_db_instance_in_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restart_db_instance_in_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3409,10 +3408,10 @@ def restart_db_instance_in_db_system(self, db_system_id, restart_db_instance_in_ "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3422,7 +3421,7 @@ def restart_db_instance_in_db_system(self, db_system_id, restart_db_instance_in_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3516,7 +3515,7 @@ def restore_db_system(self, db_system_id, restore_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3525,10 +3524,10 @@ def restore_db_system(self, db_system_id, restore_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3538,7 +3537,7 @@ def restore_db_system(self, db_system_id, restore_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3625,7 +3624,7 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_backup got unknown kwargs: {extra_kwargs!r}") @@ -3634,10 +3633,10 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "backupId": backup_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3646,7 +3645,7 @@ def update_backup(self, backup_id, update_backup_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3741,7 +3740,7 @@ def update_configuration(self, configuration_id, update_configuration_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3750,10 +3749,10 @@ def update_configuration(self, configuration_id, update_configuration_details, * "configurationId": configuration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3763,7 +3762,7 @@ def update_configuration(self, configuration_id, update_configuration_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3859,7 +3858,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3868,10 +3867,10 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "dbSystemId": db_system_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3881,7 +3880,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3978,7 +3977,7 @@ def update_db_system_db_instance(self, db_system_id, db_instance_id, update_db_s "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_db_system_db_instance got unknown kwargs: {extra_kwargs!r}") @@ -3988,10 +3987,10 @@ def update_db_system_db_instance(self, db_system_id, db_instance_id, update_db_s "dbInstanceId": db_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4001,7 +4000,7 @@ def update_db_system_db_instance(self, db_system_id, db_instance_id, update_db_s "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/queue/queue_admin_client.py b/src/oci/queue/queue_admin_client.py index 13811da531..3f1bc7e2be 100644 --- a/src/oci/queue/queue_admin_client.py +++ b/src/oci/queue/queue_admin_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def change_queue_compartment(self, queue_id, change_queue_compartment_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_queue_compartment got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def change_queue_compartment(self, queue_id, change_queue_compartment_details, * "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def change_queue_compartment(self, queue_id, change_queue_compartment_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -276,7 +275,7 @@ def create_queue(self, create_queue_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_queue got unknown kwargs: {extra_kwargs!r}") @@ -287,7 +286,7 @@ def create_queue(self, create_queue_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -372,7 +371,7 @@ def delete_queue(self, queue_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_queue got unknown kwargs: {extra_kwargs!r}") @@ -381,10 +380,10 @@ def delete_queue(self, queue_id, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -393,7 +392,7 @@ def delete_queue(self, queue_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -469,7 +468,7 @@ def get_queue(self, queue_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_queue got unknown kwargs: {extra_kwargs!r}") @@ -478,10 +477,10 @@ def get_queue(self, queue_id, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -489,7 +488,7 @@ def get_queue(self, queue_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -567,7 +566,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -576,10 +575,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -587,7 +586,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -706,7 +705,7 @@ def list_queues(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_queues got unknown kwargs: {extra_kwargs!r}") @@ -742,14 +741,14 @@ def list_queues(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -839,7 +838,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -848,24 +847,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -957,7 +956,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -966,24 +965,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1082,7 +1081,7 @@ def list_work_requests(self, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1093,14 +1092,14 @@ def list_work_requests(self, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1191,7 +1190,7 @@ def purge_queue(self, queue_id, purge_queue_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"purge_queue got unknown kwargs: {extra_kwargs!r}") @@ -1200,10 +1199,10 @@ def purge_queue(self, queue_id, purge_queue_details, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1212,7 +1211,7 @@ def purge_queue(self, queue_id, purge_queue_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1301,7 +1300,7 @@ def update_queue(self, queue_id, update_queue_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_queue got unknown kwargs: {extra_kwargs!r}") @@ -1310,10 +1309,10 @@ def update_queue(self, queue_id, update_queue_details, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1322,7 +1321,7 @@ def update_queue(self, queue_id, update_queue_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/queue/queue_client.py b/src/oci/queue/queue_client.py index 15b2eddd91..06e1b969e5 100644 --- a/src/oci/queue/queue_client.py +++ b/src/oci/queue/queue_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -165,7 +164,7 @@ def delete_message(self, queue_id, message_receipt, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_message got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def delete_message(self, queue_id, message_receipt, **kwargs): "messageReceipt": message_receipt } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -186,7 +185,7 @@ def delete_message(self, queue_id, message_receipt, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -269,7 +268,7 @@ def delete_messages(self, queue_id, delete_messages_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_messages got unknown kwargs: {extra_kwargs!r}") @@ -278,10 +277,10 @@ def delete_messages(self, queue_id, delete_messages_details, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -289,7 +288,7 @@ def delete_messages(self, queue_id, delete_messages_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -399,7 +398,7 @@ def get_messages(self, queue_id, **kwargs): "opc_request_id", "channel_filter" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_messages got unknown kwargs: {extra_kwargs!r}") @@ -408,10 +407,10 @@ def get_messages(self, queue_id, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -420,14 +419,14 @@ def get_messages(self, queue_id, **kwargs): "limit": kwargs.get("limit", missing), "channelFilter": kwargs.get("channel_filter", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -513,7 +512,7 @@ def get_stats(self, queue_id, **kwargs): "opc_request_id", "channel_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stats got unknown kwargs: {extra_kwargs!r}") @@ -522,23 +521,23 @@ def get_stats(self, queue_id, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "channelId": kwargs.get("channel_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -637,7 +636,7 @@ def list_channels(self, queue_id, **kwargs): "page", "channel_filter" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_channels got unknown kwargs: {extra_kwargs!r}") @@ -646,10 +645,10 @@ def list_channels(self, queue_id, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -657,14 +656,14 @@ def list_channels(self, queue_id, **kwargs): "page": kwargs.get("page", missing), "channelFilter": kwargs.get("channel_filter", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -751,7 +750,7 @@ def put_messages(self, queue_id, put_messages_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_messages got unknown kwargs: {extra_kwargs!r}") @@ -760,10 +759,10 @@ def put_messages(self, queue_id, put_messages_details, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -771,7 +770,7 @@ def put_messages(self, queue_id, put_messages_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -859,7 +858,7 @@ def update_message(self, queue_id, message_receipt, update_message_details, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_message got unknown kwargs: {extra_kwargs!r}") @@ -869,10 +868,10 @@ def update_message(self, queue_id, message_receipt, update_message_details, **kw "messageReceipt": message_receipt } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -880,7 +879,7 @@ def update_message(self, queue_id, message_receipt, update_message_details, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -967,7 +966,7 @@ def update_messages(self, queue_id, update_messages_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_messages got unknown kwargs: {extra_kwargs!r}") @@ -976,10 +975,10 @@ def update_messages(self, queue_id, update_messages_details, **kwargs): "queueId": queue_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -987,7 +986,7 @@ def update_messages(self, queue_id, update_messages_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/recovery/database_recovery_client.py b/src/oci/recovery/database_recovery_client.py index 81da32353f..ab23144580 100644 --- a/src/oci/recovery/database_recovery_client.py +++ b/src/oci/recovery/database_recovery_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def change_protected_database_compartment(self, protected_database_id, change_pr "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_protected_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def change_protected_database_compartment(self, protected_database_id, change_pr "protectedDatabaseId": protected_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def change_protected_database_compartment(self, protected_database_id, change_pr "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def change_protection_policy_compartment(self, protection_policy_id, change_prot "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_protection_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -288,10 +287,10 @@ def change_protection_policy_compartment(self, protection_policy_id, change_prot "protectionPolicyId": protection_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -300,7 +299,7 @@ def change_protection_policy_compartment(self, protection_policy_id, change_prot "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -389,7 +388,7 @@ def change_recovery_service_subnet_compartment(self, recovery_service_subnet_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_recovery_service_subnet_compartment got unknown kwargs: {extra_kwargs!r}") @@ -398,10 +397,10 @@ def change_recovery_service_subnet_compartment(self, recovery_service_subnet_id, "recoveryServiceSubnetId": recovery_service_subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -410,7 +409,7 @@ def change_recovery_service_subnet_compartment(self, recovery_service_subnet_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -496,7 +495,7 @@ def create_protected_database(self, create_protected_database_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_protected_database got unknown kwargs: {extra_kwargs!r}") @@ -507,7 +506,7 @@ def create_protected_database(self, create_protected_database_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -594,7 +593,7 @@ def create_protection_policy(self, create_protection_policy_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_protection_policy got unknown kwargs: {extra_kwargs!r}") @@ -605,7 +604,7 @@ def create_protection_policy(self, create_protection_policy_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -692,7 +691,7 @@ def create_recovery_service_subnet(self, create_recovery_service_subnet_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_recovery_service_subnet got unknown kwargs: {extra_kwargs!r}") @@ -703,7 +702,7 @@ def create_recovery_service_subnet(self, create_recovery_service_subnet_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -790,7 +789,7 @@ def delete_protected_database(self, protected_database_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_protected_database got unknown kwargs: {extra_kwargs!r}") @@ -799,10 +798,10 @@ def delete_protected_database(self, protected_database_id, **kwargs): "protectedDatabaseId": protected_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -811,7 +810,7 @@ def delete_protected_database(self, protected_database_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -896,7 +895,7 @@ def delete_protection_policy(self, protection_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_protection_policy got unknown kwargs: {extra_kwargs!r}") @@ -905,10 +904,10 @@ def delete_protection_policy(self, protection_policy_id, **kwargs): "protectionPolicyId": protection_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -917,7 +916,7 @@ def delete_protection_policy(self, protection_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1001,7 +1000,7 @@ def delete_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_recovery_service_subnet got unknown kwargs: {extra_kwargs!r}") @@ -1010,10 +1009,10 @@ def delete_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "recoveryServiceSubnetId": recovery_service_subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1022,7 +1021,7 @@ def delete_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1110,7 +1109,7 @@ def fetch_protected_database_configuration(self, protected_database_id, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"fetch_protected_database_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1119,10 +1118,10 @@ def fetch_protected_database_configuration(self, protected_database_id, **kwargs "protectedDatabaseId": protected_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1131,7 +1130,7 @@ def fetch_protected_database_configuration(self, protected_database_id, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1211,7 +1210,7 @@ def get_protected_database(self, protected_database_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_protected_database got unknown kwargs: {extra_kwargs!r}") @@ -1220,10 +1219,10 @@ def get_protected_database(self, protected_database_id, **kwargs): "protectedDatabaseId": protected_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1231,7 +1230,7 @@ def get_protected_database(self, protected_database_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1309,7 +1308,7 @@ def get_protection_policy(self, protection_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_protection_policy got unknown kwargs: {extra_kwargs!r}") @@ -1318,10 +1317,10 @@ def get_protection_policy(self, protection_policy_id, **kwargs): "protectionPolicyId": protection_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1329,7 +1328,7 @@ def get_protection_policy(self, protection_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1407,7 +1406,7 @@ def get_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_recovery_service_subnet got unknown kwargs: {extra_kwargs!r}") @@ -1416,10 +1415,10 @@ def get_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "recoveryServiceSubnetId": recovery_service_subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1427,7 +1426,7 @@ def get_recovery_service_subnet(self, recovery_service_subnet_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1505,7 +1504,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1514,10 +1513,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1525,7 +1524,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1651,7 +1650,7 @@ def list_protected_databases(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protected_databases got unknown kwargs: {extra_kwargs!r}") @@ -1689,14 +1688,14 @@ def list_protected_databases(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1820,7 +1819,7 @@ def list_protection_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protection_policies got unknown kwargs: {extra_kwargs!r}") @@ -1864,14 +1863,14 @@ def list_protection_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2000,7 +1999,7 @@ def list_recovery_service_subnets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recovery_service_subnets got unknown kwargs: {extra_kwargs!r}") @@ -2037,14 +2036,14 @@ def list_recovery_service_subnets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2145,7 +2144,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2154,10 +2153,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2180,14 +2179,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2290,7 +2289,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2299,10 +2298,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2325,14 +2324,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2449,7 +2448,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2485,14 +2484,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2581,7 +2580,7 @@ def update_protected_database(self, protected_database_id, update_protected_data "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_protected_database got unknown kwargs: {extra_kwargs!r}") @@ -2590,10 +2589,10 @@ def update_protected_database(self, protected_database_id, update_protected_data "protectedDatabaseId": protected_database_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2602,7 +2601,7 @@ def update_protected_database(self, protected_database_id, update_protected_data "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2691,7 +2690,7 @@ def update_protection_policy(self, protection_policy_id, update_protection_polic "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_protection_policy got unknown kwargs: {extra_kwargs!r}") @@ -2700,10 +2699,10 @@ def update_protection_policy(self, protection_policy_id, update_protection_polic "protectionPolicyId": protection_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2712,7 +2711,7 @@ def update_protection_policy(self, protection_policy_id, update_protection_polic "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2801,7 +2800,7 @@ def update_recovery_service_subnet(self, recovery_service_subnet_id, update_reco "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_recovery_service_subnet got unknown kwargs: {extra_kwargs!r}") @@ -2810,10 +2809,10 @@ def update_recovery_service_subnet(self, recovery_service_subnet_id, update_reco "recoveryServiceSubnetId": recovery_service_subnet_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2822,7 +2821,7 @@ def update_recovery_service_subnet(self, recovery_service_subnet_id, update_reco "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/redis/redis_cluster_client.py b/src/oci/redis/redis_cluster_client.py index d2e7a6918b..35c1a778b5 100644 --- a/src/oci/redis/redis_cluster_client.py +++ b/src/oci/redis/redis_cluster_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def change_redis_cluster_compartment(self, redis_cluster_id, change_redis_cluste "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_redis_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -295,10 +294,10 @@ def change_redis_cluster_compartment(self, redis_cluster_id, change_redis_cluste "redisClusterId": redis_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -308,7 +307,7 @@ def change_redis_cluster_compartment(self, redis_cluster_id, change_redis_cluste "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -397,7 +396,7 @@ def create_redis_cluster(self, create_redis_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_redis_cluster got unknown kwargs: {extra_kwargs!r}") @@ -408,7 +407,7 @@ def create_redis_cluster(self, create_redis_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -499,7 +498,7 @@ def delete_redis_cluster(self, redis_cluster_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_redis_cluster got unknown kwargs: {extra_kwargs!r}") @@ -508,10 +507,10 @@ def delete_redis_cluster(self, redis_cluster_id, **kwargs): "redisClusterId": redis_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -520,7 +519,7 @@ def delete_redis_cluster(self, redis_cluster_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -600,7 +599,7 @@ def get_redis_cluster(self, redis_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_redis_cluster got unknown kwargs: {extra_kwargs!r}") @@ -609,10 +608,10 @@ def get_redis_cluster(self, redis_cluster_id, **kwargs): "redisClusterId": redis_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -620,7 +619,7 @@ def get_redis_cluster(self, redis_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -698,7 +697,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -707,10 +706,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -718,7 +717,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -835,7 +834,7 @@ def list_redis_clusters(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_redis_clusters got unknown kwargs: {extra_kwargs!r}") @@ -871,14 +870,14 @@ def list_redis_clusters(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -976,7 +975,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -985,10 +984,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1011,14 +1010,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1118,7 +1117,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1127,10 +1126,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1153,14 +1152,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1277,7 +1276,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1313,14 +1312,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1413,7 +1412,7 @@ def update_redis_cluster(self, redis_cluster_id, update_redis_cluster_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_redis_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1422,10 +1421,10 @@ def update_redis_cluster(self, redis_cluster_id, update_redis_cluster_details, * "redisClusterId": redis_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1434,7 +1433,7 @@ def update_redis_cluster(self, redis_cluster_id, update_redis_cluster_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/regions.py b/src/oci/regions.py index ffb9d66b61..6531897cb4 100644 --- a/src/oci/regions.py +++ b/src/oci/regions.py @@ -11,7 +11,6 @@ from . import regions_definitions from . import service_endpoints from oci.exceptions import InvalidAlloyConfig -from oci._vendor import six from oci._vendor import requests from oci._vendor.requests.exceptions import HTTPError, ConnectionError, RetryError from oci._vendor.requests.adapters import HTTPAdapter @@ -218,7 +217,7 @@ def _reset_region_info(): def _add_region_information_to_override(region_metadata): if _check_valid_schema(region_metadata): - region_metadata = {k: v.lower() for k, v in six.iteritems(region_metadata)} + region_metadata = {k: v.lower() for k, v in region_metadata.items()} REGIONS_SHORT_NAMES[region_metadata[REGION_KEY_PROPERTY_NAME]] = region_metadata[ REGION_IDENTIFIER_PROPERTY_NAME] REGION_REALMS[region_metadata[REGION_IDENTIFIER_PROPERTY_NAME]] = region_metadata[REALM_KEY_PROPERTY_NAME] @@ -422,7 +421,7 @@ def _check_valid_schema(region_metadata): def _add_region_information_to_lookup(region_metadata, region=None): # Check if the region metadata has information about the requested region # Add the region information from region_metadata to the existing lookups - region_metadata = {k: v.lower() for k, v in six.iteritems(region_metadata)} + region_metadata = {k: v.lower() for k, v in region_metadata.items()} if region_metadata[REGION_KEY_PROPERTY_NAME] not in REGIONS_SHORT_NAMES: REGIONS_SHORT_NAMES[region_metadata[REGION_KEY_PROPERTY_NAME]] = region_metadata[REGION_IDENTIFIER_PROPERTY_NAME] diff --git a/src/oci/resource_manager/resource_manager_client.py b/src/oci/resource_manager/resource_manager_client.py index ae37bbf1a8..9b948e618e 100644 --- a/src/oci/resource_manager/resource_manager_client.py +++ b/src/oci/resource_manager/resource_manager_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -181,7 +180,7 @@ def cancel_job(self, job_id, **kwargs): "if_match", "is_forced" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_job got unknown kwargs: {extra_kwargs!r}") @@ -190,16 +189,16 @@ def cancel_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isForced": kwargs.get("is_forced", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -207,7 +206,7 @@ def cancel_job(self, job_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -309,7 +308,7 @@ def change_configuration_source_provider_compartment(self, configuration_source_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_configuration_source_provider_compartment got unknown kwargs: {extra_kwargs!r}") @@ -318,10 +317,10 @@ def change_configuration_source_provider_compartment(self, configuration_source_ "configurationSourceProviderId": configuration_source_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -331,7 +330,7 @@ def change_configuration_source_provider_compartment(self, configuration_source_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -434,7 +433,7 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -443,10 +442,10 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -456,7 +455,7 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -559,7 +558,7 @@ def change_stack_compartment(self, stack_id, change_stack_compartment_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_stack_compartment got unknown kwargs: {extra_kwargs!r}") @@ -568,10 +567,10 @@ def change_stack_compartment(self, stack_id, change_stack_compartment_details, * "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -581,7 +580,7 @@ def change_stack_compartment(self, stack_id, change_stack_compartment_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -684,7 +683,7 @@ def change_template_compartment(self, template_id, change_template_compartment_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_template_compartment got unknown kwargs: {extra_kwargs!r}") @@ -693,10 +692,10 @@ def change_template_compartment(self, template_id, change_template_compartment_d "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -706,7 +705,7 @@ def change_template_compartment(self, template_id, change_template_compartment_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -798,7 +797,7 @@ def create_configuration_source_provider(self, create_configuration_source_provi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_configuration_source_provider got unknown kwargs: {extra_kwargs!r}") @@ -809,7 +808,7 @@ def create_configuration_source_provider(self, create_configuration_source_provi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -897,7 +896,7 @@ def create_job(self, create_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_job got unknown kwargs: {extra_kwargs!r}") @@ -908,7 +907,7 @@ def create_job(self, create_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -996,7 +995,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1007,7 +1006,7 @@ def create_private_endpoint(self, create_private_endpoint_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1103,7 +1102,7 @@ def create_stack(self, create_stack_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stack got unknown kwargs: {extra_kwargs!r}") @@ -1114,7 +1113,7 @@ def create_stack(self, create_stack_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1202,7 +1201,7 @@ def create_template(self, create_template_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_template got unknown kwargs: {extra_kwargs!r}") @@ -1213,7 +1212,7 @@ def create_template(self, create_template_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1301,7 +1300,7 @@ def delete_configuration_source_provider(self, configuration_source_provider_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_configuration_source_provider got unknown kwargs: {extra_kwargs!r}") @@ -1310,10 +1309,10 @@ def delete_configuration_source_provider(self, configuration_source_provider_id, "configurationSourceProviderId": configuration_source_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1322,7 +1321,7 @@ def delete_configuration_source_provider(self, configuration_source_provider_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1407,7 +1406,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1416,10 +1415,10 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1428,7 +1427,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1513,7 +1512,7 @@ def delete_stack(self, stack_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stack got unknown kwargs: {extra_kwargs!r}") @@ -1522,10 +1521,10 @@ def delete_stack(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1534,7 +1533,7 @@ def delete_stack(self, stack_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1619,7 +1618,7 @@ def delete_template(self, template_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_template got unknown kwargs: {extra_kwargs!r}") @@ -1628,10 +1627,10 @@ def delete_template(self, template_id, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1640,7 +1639,7 @@ def delete_template(self, template_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1737,7 +1736,7 @@ def detect_stack_drift(self, stack_id, **kwargs): "opc_retry_token", "detect_stack_drift_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"detect_stack_drift got unknown kwargs: {extra_kwargs!r}") @@ -1746,10 +1745,10 @@ def detect_stack_drift(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1759,7 +1758,7 @@ def detect_stack_drift(self, stack_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1841,7 +1840,7 @@ def get_configuration_source_provider(self, configuration_source_provider_id, ** "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_configuration_source_provider got unknown kwargs: {extra_kwargs!r}") @@ -1850,10 +1849,10 @@ def get_configuration_source_provider(self, configuration_source_provider_id, ** "configurationSourceProviderId": configuration_source_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1861,7 +1860,7 @@ def get_configuration_source_provider(self, configuration_source_provider_id, ** "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1942,7 +1941,7 @@ def get_job(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job got unknown kwargs: {extra_kwargs!r}") @@ -1951,10 +1950,10 @@ def get_job(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1962,7 +1961,7 @@ def get_job(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2045,7 +2044,7 @@ def get_job_detailed_log_content(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_detailed_log_content got unknown kwargs: {extra_kwargs!r}") @@ -2054,10 +2053,10 @@ def get_job_detailed_log_content(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2065,7 +2064,7 @@ def get_job_detailed_log_content(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2188,7 +2187,7 @@ def get_job_logs(self, job_id, **kwargs): "timestamp_greater_than_or_equal_to", "timestamp_less_than_or_equal_to" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_logs got unknown kwargs: {extra_kwargs!r}") @@ -2197,10 +2196,10 @@ def get_job_logs(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'level_greater_than_or_equal_to' in kwargs: @@ -2226,14 +2225,14 @@ def get_job_logs(self, job_id, **kwargs): "timestampGreaterThanOrEqualTo": kwargs.get("timestamp_greater_than_or_equal_to", missing), "timestampLessThanOrEqualTo": kwargs.get("timestamp_less_than_or_equal_to", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2317,7 +2316,7 @@ def get_job_logs_content(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_logs_content got unknown kwargs: {extra_kwargs!r}") @@ -2326,10 +2325,10 @@ def get_job_logs_content(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2337,7 +2336,7 @@ def get_job_logs_content(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2419,7 +2418,7 @@ def get_job_tf_config(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_tf_config got unknown kwargs: {extra_kwargs!r}") @@ -2428,10 +2427,10 @@ def get_job_tf_config(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2439,7 +2438,7 @@ def get_job_tf_config(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2530,7 +2529,7 @@ def get_job_tf_plan(self, job_id, **kwargs): "opc_request_id", "tf_plan_format" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_tf_plan got unknown kwargs: {extra_kwargs!r}") @@ -2539,10 +2538,10 @@ def get_job_tf_plan(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'tf_plan_format' in kwargs: @@ -2555,14 +2554,14 @@ def get_job_tf_plan(self, job_id, **kwargs): query_params = { "tfPlanFormat": kwargs.get("tf_plan_format", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/octet-stream", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2645,7 +2644,7 @@ def get_job_tf_state(self, job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_job_tf_state got unknown kwargs: {extra_kwargs!r}") @@ -2654,10 +2653,10 @@ def get_job_tf_state(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2665,7 +2664,7 @@ def get_job_tf_state(self, job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2746,7 +2745,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2755,10 +2754,10 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2766,7 +2765,7 @@ def get_private_endpoint(self, private_endpoint_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2859,7 +2858,7 @@ def get_reachable_ip(self, private_ip, private_endpoint_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_reachable_ip got unknown kwargs: {extra_kwargs!r}") @@ -2868,16 +2867,16 @@ def get_reachable_ip(self, private_ip, private_endpoint_id, **kwargs): "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "privateIp": private_ip } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2885,7 +2884,7 @@ def get_reachable_ip(self, private_ip, private_endpoint_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2969,7 +2968,7 @@ def get_stack(self, stack_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stack got unknown kwargs: {extra_kwargs!r}") @@ -2978,10 +2977,10 @@ def get_stack(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2989,7 +2988,7 @@ def get_stack(self, stack_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3071,7 +3070,7 @@ def get_stack_tf_config(self, stack_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stack_tf_config got unknown kwargs: {extra_kwargs!r}") @@ -3080,10 +3079,10 @@ def get_stack_tf_config(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3091,7 +3090,7 @@ def get_stack_tf_config(self, stack_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3172,7 +3171,7 @@ def get_stack_tf_state(self, stack_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stack_tf_state got unknown kwargs: {extra_kwargs!r}") @@ -3181,10 +3180,10 @@ def get_stack_tf_state(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3192,7 +3191,7 @@ def get_stack_tf_state(self, stack_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3273,7 +3272,7 @@ def get_template(self, template_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_template got unknown kwargs: {extra_kwargs!r}") @@ -3282,10 +3281,10 @@ def get_template(self, template_id, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3293,7 +3292,7 @@ def get_template(self, template_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3375,7 +3374,7 @@ def get_template_logo(self, template_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_template_logo got unknown kwargs: {extra_kwargs!r}") @@ -3384,10 +3383,10 @@ def get_template_logo(self, template_id, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3395,7 +3394,7 @@ def get_template_logo(self, template_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3477,7 +3476,7 @@ def get_template_tf_config(self, template_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_template_tf_config got unknown kwargs: {extra_kwargs!r}") @@ -3486,10 +3485,10 @@ def get_template_tf_config(self, template_id, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3497,7 +3496,7 @@ def get_template_tf_config(self, template_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3578,7 +3577,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3587,10 +3586,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3598,7 +3597,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3727,7 +3726,7 @@ def list_configuration_source_providers(self, **kwargs): "page", "config_source_provider_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_configuration_source_providers got unknown kwargs: {extra_kwargs!r}") @@ -3756,14 +3755,14 @@ def list_configuration_source_providers(self, **kwargs): "page": kwargs.get("page", missing), "configSourceProviderType": kwargs.get("config_source_provider_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3871,7 +3870,7 @@ def list_job_associated_resources(self, job_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_associated_resources got unknown kwargs: {extra_kwargs!r}") @@ -3880,10 +3879,10 @@ def list_job_associated_resources(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -3892,14 +3891,14 @@ def list_job_associated_resources(self, job_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4002,7 +4001,7 @@ def list_job_outputs(self, job_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_job_outputs got unknown kwargs: {extra_kwargs!r}") @@ -4011,10 +4010,10 @@ def list_job_outputs(self, job_id, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4022,14 +4021,14 @@ def list_job_outputs(self, job_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4183,7 +4182,7 @@ def list_jobs(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_jobs got unknown kwargs: {extra_kwargs!r}") @@ -4220,14 +4219,14 @@ def list_jobs(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4358,7 +4357,7 @@ def list_private_endpoints(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -4387,14 +4386,14 @@ def list_private_endpoints(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4480,7 +4479,7 @@ def list_resource_discovery_services(self, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_discovery_services got unknown kwargs: {extra_kwargs!r}") @@ -4488,14 +4487,14 @@ def list_resource_discovery_services(self, **kwargs): query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4603,7 +4602,7 @@ def list_stack_associated_resources(self, stack_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stack_associated_resources got unknown kwargs: {extra_kwargs!r}") @@ -4612,10 +4611,10 @@ def list_stack_associated_resources(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4624,14 +4623,14 @@ def list_stack_associated_resources(self, stack_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4747,7 +4746,7 @@ def list_stack_resource_drift_details(self, stack_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stack_resource_drift_details got unknown kwargs: {extra_kwargs!r}") @@ -4756,10 +4755,10 @@ def list_stack_resource_drift_details(self, stack_id, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -4768,14 +4767,14 @@ def list_stack_resource_drift_details(self, stack_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4920,7 +4919,7 @@ def list_stacks(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stacks got unknown kwargs: {extra_kwargs!r}") @@ -4956,14 +4955,14 @@ def list_stacks(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5039,7 +5038,7 @@ def list_template_categories(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_template_categories got unknown kwargs: {extra_kwargs!r}") @@ -5049,7 +5048,7 @@ def list_template_categories(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5179,7 +5178,7 @@ def list_templates(self, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_templates got unknown kwargs: {extra_kwargs!r}") @@ -5208,14 +5207,14 @@ def list_templates(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5297,7 +5296,7 @@ def list_terraform_versions(self, **kwargs): "opc_request_id", "compartment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_terraform_versions got unknown kwargs: {extra_kwargs!r}") @@ -5305,14 +5304,14 @@ def list_terraform_versions(self, **kwargs): query_params = { "compartmentId": kwargs.get("compartment_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5419,7 +5418,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -5428,10 +5427,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5447,14 +5446,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5563,7 +5562,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -5572,10 +5571,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5591,14 +5590,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5701,7 +5700,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5712,14 +5711,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5813,7 +5812,7 @@ def update_configuration_source_provider(self, configuration_source_provider_id, "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_configuration_source_provider got unknown kwargs: {extra_kwargs!r}") @@ -5822,10 +5821,10 @@ def update_configuration_source_provider(self, configuration_source_provider_id, "configurationSourceProviderId": configuration_source_provider_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5834,7 +5833,7 @@ def update_configuration_source_provider(self, configuration_source_provider_id, "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5926,7 +5925,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_job got unknown kwargs: {extra_kwargs!r}") @@ -5935,10 +5934,10 @@ def update_job(self, job_id, update_job_details, **kwargs): "jobId": job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5947,7 +5946,7 @@ def update_job(self, job_id, update_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6039,7 +6038,7 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6048,10 +6047,10 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "privateEndpointId": private_endpoint_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6060,7 +6059,7 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6158,7 +6157,7 @@ def update_stack(self, stack_id, update_stack_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stack got unknown kwargs: {extra_kwargs!r}") @@ -6167,10 +6166,10 @@ def update_stack(self, stack_id, update_stack_details, **kwargs): "stackId": stack_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6179,7 +6178,7 @@ def update_stack(self, stack_id, update_stack_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6271,7 +6270,7 @@ def update_template(self, template_id, update_template_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_template got unknown kwargs: {extra_kwargs!r}") @@ -6280,10 +6279,10 @@ def update_template(self, template_id, update_template_details, **kwargs): "templateId": template_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6292,7 +6291,7 @@ def update_template(self, template_id, update_template_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/resource_search/resource_search_client.py b/src/oci/resource_search/resource_search_client.py index 846e397d77..c069beb4ab 100644 --- a/src/oci/resource_search/resource_search_client.py +++ b/src/oci/resource_search/resource_search_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -159,7 +158,7 @@ def get_resource_type(self, name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_resource_type got unknown kwargs: {extra_kwargs!r}") @@ -168,10 +167,10 @@ def get_resource_type(self, name, **kwargs): "name": name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -179,7 +178,7 @@ def get_resource_type(self, name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -263,7 +262,7 @@ def list_resource_types(self, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -272,14 +271,14 @@ def list_resource_types(self, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -372,7 +371,7 @@ def search_resources(self, search_details, **kwargs): "tenant_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_resources got unknown kwargs: {extra_kwargs!r}") @@ -382,14 +381,14 @@ def search_resources(self, search_details, **kwargs): "page": kwargs.get("page", missing), "tenantId": kwargs.get("tenant_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/rover_bundle_client.py b/src/oci/rover/rover_bundle_client.py index d044d07b21..03442cc581 100644 --- a/src/oci/rover/rover_bundle_client.py +++ b/src/oci/rover/rover_bundle_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def list_rover_cluster_rover_bundle_requests(self, rover_cluster_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rover_cluster_rover_bundle_requests got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def list_rover_cluster_rover_bundle_requests(self, rover_cluster_id, **kwargs): "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -213,14 +212,14 @@ def list_rover_cluster_rover_bundle_requests(self, rover_cluster_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -320,7 +319,7 @@ def list_rover_node_rover_bundle_requests(self, rover_node_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rover_node_rover_bundle_requests got unknown kwargs: {extra_kwargs!r}") @@ -329,10 +328,10 @@ def list_rover_node_rover_bundle_requests(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -355,14 +354,14 @@ def list_rover_node_rover_bundle_requests(self, rover_node_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -445,7 +444,7 @@ def request_bundle_rover_cluster(self, request_rover_bundle_details, rover_clust "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_bundle_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -454,10 +453,10 @@ def request_bundle_rover_cluster(self, request_rover_bundle_details, rover_clust "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -465,7 +464,7 @@ def request_bundle_rover_cluster(self, request_rover_bundle_details, rover_clust "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -546,7 +545,7 @@ def request_bundle_rover_node(self, request_rover_bundle_details, rover_node_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_bundle_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -555,10 +554,10 @@ def request_bundle_rover_node(self, request_rover_bundle_details, rover_node_id, "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -566,7 +565,7 @@ def request_bundle_rover_node(self, request_rover_bundle_details, rover_node_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -647,7 +646,7 @@ def retrieve_available_bundle_versions_rover_cluster(self, current_rover_bundle_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_available_bundle_versions_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -656,10 +655,10 @@ def retrieve_available_bundle_versions_rover_cluster(self, current_rover_bundle_ "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -667,7 +666,7 @@ def retrieve_available_bundle_versions_rover_cluster(self, current_rover_bundle_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -750,7 +749,7 @@ def retrieve_available_bundle_versions_rover_node(self, current_rover_bundle_det "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_available_bundle_versions_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -759,10 +758,10 @@ def retrieve_available_bundle_versions_rover_node(self, current_rover_bundle_det "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -770,7 +769,7 @@ def retrieve_available_bundle_versions_rover_node(self, current_rover_bundle_det "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -853,7 +852,7 @@ def retrieve_bundle_status_rover_cluster(self, rover_bundle_status_details, rove "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_bundle_status_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -862,10 +861,10 @@ def retrieve_bundle_status_rover_cluster(self, rover_bundle_status_details, rove "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -873,7 +872,7 @@ def retrieve_bundle_status_rover_cluster(self, rover_bundle_status_details, rove "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -956,7 +955,7 @@ def retrieve_bundle_status_rover_node(self, rover_bundle_status_details, rover_n "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"retrieve_bundle_status_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -965,10 +964,10 @@ def retrieve_bundle_status_rover_node(self, rover_bundle_status_details, rover_n "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -976,7 +975,7 @@ def retrieve_bundle_status_rover_node(self, rover_bundle_status_details, rover_n "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/rover_cluster_client.py b/src/oci/rover/rover_cluster_client.py index 38e1057c2d..eea53d8843 100644 --- a/src/oci/rover/rover_cluster_client.py +++ b/src/oci/rover/rover_cluster_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_rover_cluster_compartment(self, rover_cluster_id, change_rover_cluste "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_rover_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_rover_cluster_compartment(self, rover_cluster_id, change_rover_cluste "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_rover_cluster_compartment(self, rover_cluster_id, change_rover_cluste "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_rover_cluster(self, create_rover_cluster_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_rover_cluster(self, create_rover_cluster_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def delete_rover_cluster(self, rover_cluster_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def delete_rover_cluster(self, rover_cluster_id, **kwargs): "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def delete_rover_cluster(self, rover_cluster_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -491,7 +490,7 @@ def get_rover_cluster(self, rover_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -500,10 +499,10 @@ def get_rover_cluster(self, rover_cluster_id, **kwargs): "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -511,7 +510,7 @@ def get_rover_cluster(self, rover_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def get_rover_cluster_certificate(self, rover_cluster_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_cluster_certificate got unknown kwargs: {extra_kwargs!r}") @@ -598,10 +597,10 @@ def get_rover_cluster_certificate(self, rover_cluster_id, **kwargs): "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -609,7 +608,7 @@ def get_rover_cluster_certificate(self, rover_cluster_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -723,7 +722,7 @@ def list_rover_clusters(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rover_clusters got unknown kwargs: {extra_kwargs!r}") @@ -766,14 +765,14 @@ def list_rover_clusters(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -870,7 +869,7 @@ def request_additional_nodes(self, rover_cluster_id, request_additional_nodes_de "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_additional_nodes got unknown kwargs: {extra_kwargs!r}") @@ -879,10 +878,10 @@ def request_additional_nodes(self, rover_cluster_id, request_additional_nodes_de "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -892,7 +891,7 @@ def request_additional_nodes(self, rover_cluster_id, request_additional_nodes_de "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -982,7 +981,7 @@ def update_rover_cluster(self, rover_cluster_id, update_rover_cluster_details, * "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rover_cluster got unknown kwargs: {extra_kwargs!r}") @@ -991,10 +990,10 @@ def update_rover_cluster(self, rover_cluster_id, update_rover_cluster_details, * "roverClusterId": rover_cluster_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1003,7 +1002,7 @@ def update_rover_cluster(self, rover_cluster_id, update_rover_cluster_details, * "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/rover_entitlement_client.py b/src/oci/rover/rover_entitlement_client.py index 497edaf45a..f3088b40c2 100644 --- a/src/oci/rover/rover_entitlement_client.py +++ b/src/oci/rover/rover_entitlement_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_rover_entitlement_compartment(self, rover_entitlement_id, change_rove "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_rover_entitlement_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_rover_entitlement_compartment(self, rover_entitlement_id, change_rove "roverEntitlementId": rover_entitlement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_rover_entitlement_compartment(self, rover_entitlement_id, change_rove "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_rover_entitlement(self, create_rover_entitlement_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rover_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_rover_entitlement(self, create_rover_entitlement_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def delete_rover_entitlement(self, rover_entitlement_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rover_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def delete_rover_entitlement(self, rover_entitlement_id, **kwargs): "roverEntitlementId": rover_entitlement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def delete_rover_entitlement(self, rover_entitlement_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -502,7 +501,7 @@ def get_rover_entitlement(self, rover_entitlement_id, compartment_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -511,16 +510,16 @@ def get_rover_entitlement(self, rover_entitlement_id, compartment_id, **kwargs): "roverEntitlementId": rover_entitlement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -528,7 +527,7 @@ def get_rover_entitlement(self, rover_entitlement_id, compartment_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -643,7 +642,7 @@ def list_rover_entitlements(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rover_entitlements got unknown kwargs: {extra_kwargs!r}") @@ -679,14 +678,14 @@ def list_rover_entitlements(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -775,7 +774,7 @@ def update_rover_entitlement(self, rover_entitlement_id, update_rover_entitlemen "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rover_entitlement got unknown kwargs: {extra_kwargs!r}") @@ -784,10 +783,10 @@ def update_rover_entitlement(self, rover_entitlement_id, update_rover_entitlemen "roverEntitlementId": rover_entitlement_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -796,7 +795,7 @@ def update_rover_entitlement(self, rover_entitlement_id, update_rover_entitlemen "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/rover_node_client.py b/src/oci/rover/rover_node_client.py index c9ec6f701e..2957f6c66d 100644 --- a/src/oci/rover/rover_node_client.py +++ b/src/oci/rover/rover_node_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_rover_node_compartment(self, rover_node_id, change_rover_node_compart "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_rover_node_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_rover_node_compartment(self, rover_node_id, change_rover_node_compart "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_rover_node_compartment(self, rover_node_id, change_rover_node_compart "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -286,7 +285,7 @@ def create_rover_node(self, create_rover_node_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -297,7 +296,7 @@ def create_rover_node(self, create_rover_node_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def delete_rover_node(self, rover_node_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def delete_rover_node(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def delete_rover_node(self, rover_node_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -491,7 +490,7 @@ def get_rover_node(self, rover_node_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -500,10 +499,10 @@ def get_rover_node(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -511,7 +510,7 @@ def get_rover_node(self, rover_node_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def get_rover_node_certificate(self, rover_node_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_node_certificate got unknown kwargs: {extra_kwargs!r}") @@ -598,10 +597,10 @@ def get_rover_node_certificate(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -609,7 +608,7 @@ def get_rover_node_certificate(self, rover_node_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -687,7 +686,7 @@ def get_rover_node_encryption_key(self, rover_node_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_node_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -696,10 +695,10 @@ def get_rover_node_encryption_key(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -707,7 +706,7 @@ def get_rover_node_encryption_key(self, rover_node_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -789,7 +788,7 @@ def get_rover_node_get_rpt(self, rover_node_id, jwt, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_rover_node_get_rpt got unknown kwargs: {extra_kwargs!r}") @@ -798,10 +797,10 @@ def get_rover_node_get_rpt(self, rover_node_id, jwt, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -810,7 +809,7 @@ def get_rover_node_get_rpt(self, rover_node_id, jwt, **kwargs): "jwt": jwt, "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -928,7 +927,7 @@ def list_rover_nodes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rover_nodes got unknown kwargs: {extra_kwargs!r}") @@ -972,14 +971,14 @@ def list_rover_nodes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1073,7 +1072,7 @@ def rover_node_action_retrieve_ca_bundle(self, rover_node_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_action_retrieve_ca_bundle got unknown kwargs: {extra_kwargs!r}") @@ -1082,10 +1081,10 @@ def rover_node_action_retrieve_ca_bundle(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1095,7 +1094,7 @@ def rover_node_action_retrieve_ca_bundle(self, rover_node_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1197,7 +1196,7 @@ def rover_node_action_set_key(self, rover_node_id, jwt, rover_node_action_set_ke "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_action_set_key got unknown kwargs: {extra_kwargs!r}") @@ -1206,10 +1205,10 @@ def rover_node_action_set_key(self, rover_node_id, jwt, rover_node_action_set_ke "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1220,7 +1219,7 @@ def rover_node_action_set_key(self, rover_node_id, jwt, rover_node_action_set_ke "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1320,7 +1319,7 @@ def rover_node_generate_certificate(self, rover_node_generate_certificate_detail "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_generate_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1329,10 +1328,10 @@ def rover_node_generate_certificate(self, rover_node_generate_certificate_detail "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1342,7 +1341,7 @@ def rover_node_generate_certificate(self, rover_node_generate_certificate_detail "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1442,7 +1441,7 @@ def rover_node_renew_certificate(self, rover_node_renew_certificate_details, rov "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_renew_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1451,10 +1450,10 @@ def rover_node_renew_certificate(self, rover_node_renew_certificate_details, rov "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1464,7 +1463,7 @@ def rover_node_renew_certificate(self, rover_node_renew_certificate_details, rov "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1564,7 +1563,7 @@ def rover_node_replace_certificate_authority(self, rover_node_replace_certificat "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_replace_certificate_authority got unknown kwargs: {extra_kwargs!r}") @@ -1573,10 +1572,10 @@ def rover_node_replace_certificate_authority(self, rover_node_replace_certificat "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1586,7 +1585,7 @@ def rover_node_replace_certificate_authority(self, rover_node_replace_certificat "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1683,7 +1682,7 @@ def rover_node_retrieve_leaf_certificate(self, rover_node_id, **kwargs): "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rover_node_retrieve_leaf_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1692,10 +1691,10 @@ def rover_node_retrieve_leaf_certificate(self, rover_node_id, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1705,7 +1704,7 @@ def rover_node_retrieve_leaf_certificate(self, rover_node_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1795,7 +1794,7 @@ def update_rover_node(self, rover_node_id, update_rover_node_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_rover_node got unknown kwargs: {extra_kwargs!r}") @@ -1804,10 +1803,10 @@ def update_rover_node(self, rover_node_id, update_rover_node_details, **kwargs): "roverNodeId": rover_node_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1816,7 +1815,7 @@ def update_rover_node(self, rover_node_id, update_rover_node_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/shape_client.py b/src/oci/rover/shape_client.py index 3eb49c8e80..e727bd39fa 100644 --- a/src/oci/rover/shape_client.py +++ b/src/oci/rover/shape_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -178,7 +177,7 @@ def list_shapes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_shapes got unknown kwargs: {extra_kwargs!r}") @@ -204,14 +203,14 @@ def list_shapes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/rover/work_requests_client.py b/src/oci/rover/work_requests_client.py index a4093a0832..c764af832b 100644 --- a/src/oci/rover/work_requests_client.py +++ b/src/oci/rover/work_requests_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -273,7 +272,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -282,10 +281,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -293,7 +292,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -391,7 +390,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -400,10 +399,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -426,14 +425,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -533,7 +532,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -542,10 +541,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -568,14 +567,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -691,7 +690,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -734,14 +733,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/sch/connector_plugins_client.py b/src/oci/sch/connector_plugins_client.py index 5139603e72..4d80403da5 100644 --- a/src/oci/sch/connector_plugins_client.py +++ b/src/oci/sch/connector_plugins_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def get_connector_plugin(self, connector_plugin_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connector_plugin got unknown kwargs: {extra_kwargs!r}") @@ -171,10 +170,10 @@ def get_connector_plugin(self, connector_plugin_name, **kwargs): "connectorPluginName": connector_plugin_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -182,7 +181,7 @@ def get_connector_plugin(self, connector_plugin_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -307,7 +306,7 @@ def list_connector_plugins(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connector_plugins got unknown kwargs: {extra_kwargs!r}") @@ -342,14 +341,14 @@ def list_connector_plugins(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/sch/service_connector_client.py b/src/oci/sch/service_connector_client.py index a70f2e53be..1d03710cd0 100644 --- a/src/oci/sch/service_connector_client.py +++ b/src/oci/sch/service_connector_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -188,7 +187,7 @@ def activate_service_connector(self, service_connector_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -197,10 +196,10 @@ def activate_service_connector(self, service_connector_id, **kwargs): "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -210,7 +209,7 @@ def activate_service_connector(self, service_connector_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -307,7 +306,7 @@ def change_service_connector_compartment(self, service_connector_id, change_serv "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_service_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -316,10 +315,10 @@ def change_service_connector_compartment(self, service_connector_id, change_serv "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -328,7 +327,7 @@ def change_service_connector_compartment(self, service_connector_id, change_serv "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -440,7 +439,7 @@ def create_service_connector(self, create_service_connector_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -451,7 +450,7 @@ def create_service_connector(self, create_service_connector_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -554,7 +553,7 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"deactivate_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -563,10 +562,10 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -576,7 +575,7 @@ def deactivate_service_connector(self, service_connector_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -671,7 +670,7 @@ def delete_service_connector(self, service_connector_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -680,10 +679,10 @@ def delete_service_connector(self, service_connector_id, **kwargs): "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -692,7 +691,7 @@ def delete_service_connector(self, service_connector_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -775,7 +774,7 @@ def get_service_connector(self, service_connector_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -784,10 +783,10 @@ def get_service_connector(self, service_connector_id, **kwargs): "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -795,7 +794,7 @@ def get_service_connector(self, service_connector_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -880,7 +879,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -889,10 +888,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -900,7 +899,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1028,7 +1027,7 @@ def list_service_connectors(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_connectors got unknown kwargs: {extra_kwargs!r}") @@ -1063,14 +1062,14 @@ def list_service_connectors(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1171,7 +1170,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1180,24 +1179,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1300,7 +1299,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1309,24 +1308,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1429,7 +1428,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1439,14 +1438,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1546,7 +1545,7 @@ def update_service_connector(self, service_connector_id, update_service_connecto "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_service_connector got unknown kwargs: {extra_kwargs!r}") @@ -1555,10 +1554,10 @@ def update_service_connector(self, service_connector_id, update_service_connecto "serviceConnectorId": service_connector_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1567,7 +1566,7 @@ def update_service_connector(self, service_connector_id, update_service_connecto "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/secrets/secrets_client.py b/src/oci/secrets/secrets_client.py index b58ed8100d..9f971c433a 100644 --- a/src/oci/secrets/secrets_client.py +++ b/src/oci/secrets/secrets_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -173,7 +172,7 @@ def get_secret_bundle(self, secret_id, **kwargs): "secret_version_name", "stage" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_secret_bundle got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def get_secret_bundle(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'stage' in kwargs: @@ -200,14 +199,14 @@ def get_secret_bundle(self, secret_id, **kwargs): "secretVersionName": kwargs.get("secret_version_name", missing), "stage": kwargs.get("stage", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -305,7 +304,7 @@ def get_secret_bundle_by_name(self, secret_name, vault_id, **kwargs): "secret_version_name", "stage" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_secret_bundle_by_name got unknown kwargs: {extra_kwargs!r}") @@ -324,14 +323,14 @@ def get_secret_bundle_by_name(self, secret_name, vault_id, **kwargs): "secretVersionName": kwargs.get("secret_version_name", missing), "stage": kwargs.get("stage", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -436,7 +435,7 @@ def list_secret_bundle_versions(self, secret_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_secret_bundle_versions got unknown kwargs: {extra_kwargs!r}") @@ -445,10 +444,10 @@ def list_secret_bundle_versions(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -471,14 +470,14 @@ def list_secret_bundle_versions(self, secret_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/service_catalog/service_catalog_client.py b/src/oci/service_catalog/service_catalog_client.py index 00768ce811..639488fa97 100644 --- a/src/oci/service_catalog/service_catalog_client.py +++ b/src/oci/service_catalog/service_catalog_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -168,7 +167,7 @@ def bulk_replace_service_catalog_associations(self, service_catalog_id, bulk_rep "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"bulk_replace_service_catalog_associations got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def bulk_replace_service_catalog_associations(self, service_catalog_id, bulk_rep "serviceCatalogId": service_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -189,7 +188,7 @@ def bulk_replace_service_catalog_associations(self, service_catalog_id, bulk_rep "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -275,7 +274,7 @@ def change_private_application_compartment(self, private_application_id, change_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_private_application_compartment got unknown kwargs: {extra_kwargs!r}") @@ -284,10 +283,10 @@ def change_private_application_compartment(self, private_application_id, change_ "privateApplicationId": private_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -296,7 +295,7 @@ def change_private_application_compartment(self, private_application_id, change_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def change_service_catalog_compartment(self, service_catalog_id, change_service_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_service_catalog_compartment got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def change_service_catalog_compartment(self, service_catalog_id, change_service_ "serviceCatalogId": service_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -403,7 +402,7 @@ def change_service_catalog_compartment(self, service_catalog_id, change_service_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -487,7 +486,7 @@ def create_private_application(self, create_private_application_details, **kwarg "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_private_application got unknown kwargs: {extra_kwargs!r}") @@ -498,7 +497,7 @@ def create_private_application(self, create_private_application_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -583,7 +582,7 @@ def create_service_catalog(self, create_service_catalog_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_catalog got unknown kwargs: {extra_kwargs!r}") @@ -594,7 +593,7 @@ def create_service_catalog(self, create_service_catalog_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -679,7 +678,7 @@ def create_service_catalog_association(self, create_service_catalog_association_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_service_catalog_association got unknown kwargs: {extra_kwargs!r}") @@ -690,7 +689,7 @@ def create_service_catalog_association(self, create_service_catalog_association_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -774,7 +773,7 @@ def delete_private_application(self, private_application_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_private_application got unknown kwargs: {extra_kwargs!r}") @@ -783,10 +782,10 @@ def delete_private_application(self, private_application_id, **kwargs): "privateApplicationId": private_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -795,7 +794,7 @@ def delete_private_application(self, private_application_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -876,7 +875,7 @@ def delete_service_catalog(self, service_catalog_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_catalog got unknown kwargs: {extra_kwargs!r}") @@ -885,10 +884,10 @@ def delete_service_catalog(self, service_catalog_id, **kwargs): "serviceCatalogId": service_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -897,7 +896,7 @@ def delete_service_catalog(self, service_catalog_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -978,7 +977,7 @@ def delete_service_catalog_association(self, service_catalog_association_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_service_catalog_association got unknown kwargs: {extra_kwargs!r}") @@ -987,10 +986,10 @@ def delete_service_catalog_association(self, service_catalog_association_id, **k "serviceCatalogAssociationId": service_catalog_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -999,7 +998,7 @@ def delete_service_catalog_association(self, service_catalog_association_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1074,7 +1073,7 @@ def get_private_application(self, private_application_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_application got unknown kwargs: {extra_kwargs!r}") @@ -1083,10 +1082,10 @@ def get_private_application(self, private_application_id, **kwargs): "privateApplicationId": private_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1094,7 +1093,7 @@ def get_private_application(self, private_application_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1171,7 +1170,7 @@ def get_private_application_action_download_logo(self, private_application_id, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_application_action_download_logo got unknown kwargs: {extra_kwargs!r}") @@ -1180,10 +1179,10 @@ def get_private_application_action_download_logo(self, private_application_id, * "privateApplicationId": private_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1191,7 +1190,7 @@ def get_private_application_action_download_logo(self, private_application_id, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1268,7 +1267,7 @@ def get_private_application_package(self, private_application_package_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_application_package got unknown kwargs: {extra_kwargs!r}") @@ -1277,10 +1276,10 @@ def get_private_application_package(self, private_application_package_id, **kwar "privateApplicationPackageId": private_application_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1288,7 +1287,7 @@ def get_private_application_package(self, private_application_package_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1365,7 +1364,7 @@ def get_private_application_package_action_download_config(self, private_applica "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_private_application_package_action_download_config got unknown kwargs: {extra_kwargs!r}") @@ -1374,10 +1373,10 @@ def get_private_application_package_action_download_config(self, private_applica "privateApplicationPackageId": private_application_package_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1385,7 +1384,7 @@ def get_private_application_package_action_download_config(self, private_applica "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1462,7 +1461,7 @@ def get_service_catalog(self, service_catalog_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_catalog got unknown kwargs: {extra_kwargs!r}") @@ -1471,10 +1470,10 @@ def get_service_catalog(self, service_catalog_id, **kwargs): "serviceCatalogId": service_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1482,7 +1481,7 @@ def get_service_catalog(self, service_catalog_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1559,7 +1558,7 @@ def get_service_catalog_association(self, service_catalog_association_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_catalog_association got unknown kwargs: {extra_kwargs!r}") @@ -1568,10 +1567,10 @@ def get_service_catalog_association(self, service_catalog_association_id, **kwar "serviceCatalogAssociationId": service_catalog_association_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1579,7 +1578,7 @@ def get_service_catalog_association(self, service_catalog_association_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1656,7 +1655,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1665,10 +1664,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1676,7 +1675,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1808,7 +1807,7 @@ def list_applications(self, **kwargs): "is_featured", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_applications got unknown kwargs: {extra_kwargs!r}") @@ -1850,14 +1849,14 @@ def list_applications(self, **kwargs): "isFeatured": kwargs.get("is_featured", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1971,7 +1970,7 @@ def list_private_application_packages(self, private_application_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_application_packages got unknown kwargs: {extra_kwargs!r}") @@ -2008,14 +2007,14 @@ def list_private_application_packages(self, private_application_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2121,7 +2120,7 @@ def list_private_applications(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_private_applications got unknown kwargs: {extra_kwargs!r}") @@ -2149,14 +2148,14 @@ def list_private_applications(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2266,7 +2265,7 @@ def list_service_catalog_associations(self, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_catalog_associations got unknown kwargs: {extra_kwargs!r}") @@ -2295,14 +2294,14 @@ def list_service_catalog_associations(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2407,7 +2406,7 @@ def list_service_catalogs(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_catalogs got unknown kwargs: {extra_kwargs!r}") @@ -2435,14 +2434,14 @@ def list_service_catalogs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2539,7 +2538,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2548,10 +2547,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2574,14 +2573,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2680,7 +2679,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2689,10 +2688,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -2715,14 +2714,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2836,7 +2835,7 @@ def list_work_requests(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2872,14 +2871,14 @@ def list_work_requests(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2965,7 +2964,7 @@ def update_private_application(self, private_application_id, update_private_appl "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_private_application got unknown kwargs: {extra_kwargs!r}") @@ -2974,10 +2973,10 @@ def update_private_application(self, private_application_id, update_private_appl "privateApplicationId": private_application_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2986,7 +2985,7 @@ def update_private_application(self, private_application_id, update_private_appl "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3074,7 +3073,7 @@ def update_service_catalog(self, service_catalog_id, update_service_catalog_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_service_catalog got unknown kwargs: {extra_kwargs!r}") @@ -3083,10 +3082,10 @@ def update_service_catalog(self, service_catalog_id, update_service_catalog_deta "serviceCatalogId": service_catalog_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3095,7 +3094,7 @@ def update_service_catalog(self, service_catalog_id, update_service_catalog_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/service_manager_proxy/service_manager_proxy_client.py b/src/oci/service_manager_proxy/service_manager_proxy_client.py index a34fa7eeae..523301ff18 100644 --- a/src/oci/service_manager_proxy/service_manager_proxy_client.py +++ b/src/oci/service_manager_proxy/service_manager_proxy_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def get_service_environment(self, service_environment_id, compartment_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_service_environment got unknown kwargs: {extra_kwargs!r}") @@ -178,23 +177,23 @@ def get_service_environment(self, service_environment_id, compartment_id, **kwar "serviceEnvironmentId": service_environment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -313,7 +312,7 @@ def list_service_environments(self, compartment_id, **kwargs): "sort_order", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_service_environments got unknown kwargs: {extra_kwargs!r}") @@ -342,14 +341,14 @@ def list_service_environments(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/service_mesh/service_mesh_client.py b/src/oci/service_mesh/service_mesh_client.py index 5b654b2daa..92d6f2a0de 100644 --- a/src/oci/service_mesh/service_mesh_client.py +++ b/src/oci/service_mesh/service_mesh_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -282,7 +281,7 @@ def change_access_policy_compartment(self, access_policy_id, change_access_polic "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_access_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -291,10 +290,10 @@ def change_access_policy_compartment(self, access_policy_id, change_access_polic "accessPolicyId": access_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -304,7 +303,7 @@ def change_access_policy_compartment(self, access_policy_id, change_access_polic "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -402,7 +401,7 @@ def change_ingress_gateway_compartment(self, ingress_gateway_id, change_ingress_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ingress_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -411,10 +410,10 @@ def change_ingress_gateway_compartment(self, ingress_gateway_id, change_ingress_ "ingressGatewayId": ingress_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -424,7 +423,7 @@ def change_ingress_gateway_compartment(self, ingress_gateway_id, change_ingress_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -522,7 +521,7 @@ def change_ingress_gateway_route_table_compartment(self, ingress_gateway_route_t "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ingress_gateway_route_table_compartment got unknown kwargs: {extra_kwargs!r}") @@ -531,10 +530,10 @@ def change_ingress_gateway_route_table_compartment(self, ingress_gateway_route_t "ingressGatewayRouteTableId": ingress_gateway_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -544,7 +543,7 @@ def change_ingress_gateway_route_table_compartment(self, ingress_gateway_route_t "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -642,7 +641,7 @@ def change_mesh_compartment(self, mesh_id, change_mesh_compartment_details, **kw "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_mesh_compartment got unknown kwargs: {extra_kwargs!r}") @@ -651,10 +650,10 @@ def change_mesh_compartment(self, mesh_id, change_mesh_compartment_details, **kw "meshId": mesh_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -664,7 +663,7 @@ def change_mesh_compartment(self, mesh_id, change_mesh_compartment_details, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -762,7 +761,7 @@ def change_virtual_deployment_compartment(self, virtual_deployment_id, change_vi "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_virtual_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -771,10 +770,10 @@ def change_virtual_deployment_compartment(self, virtual_deployment_id, change_vi "virtualDeploymentId": virtual_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -784,7 +783,7 @@ def change_virtual_deployment_compartment(self, virtual_deployment_id, change_vi "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -882,7 +881,7 @@ def change_virtual_service_compartment(self, virtual_service_id, change_virtual_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_virtual_service_compartment got unknown kwargs: {extra_kwargs!r}") @@ -891,10 +890,10 @@ def change_virtual_service_compartment(self, virtual_service_id, change_virtual_ "virtualServiceId": virtual_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -904,7 +903,7 @@ def change_virtual_service_compartment(self, virtual_service_id, change_virtual_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1002,7 +1001,7 @@ def change_virtual_service_route_table_compartment(self, virtual_service_route_t "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_virtual_service_route_table_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1011,10 +1010,10 @@ def change_virtual_service_route_table_compartment(self, virtual_service_route_t "virtualServiceRouteTableId": virtual_service_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1024,7 +1023,7 @@ def change_virtual_service_route_table_compartment(self, virtual_service_route_t "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1111,7 +1110,7 @@ def create_access_policy(self, create_access_policy_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_access_policy got unknown kwargs: {extra_kwargs!r}") @@ -1122,7 +1121,7 @@ def create_access_policy(self, create_access_policy_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1209,7 +1208,7 @@ def create_ingress_gateway(self, create_ingress_gateway_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ingress_gateway got unknown kwargs: {extra_kwargs!r}") @@ -1220,7 +1219,7 @@ def create_ingress_gateway(self, create_ingress_gateway_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1307,7 +1306,7 @@ def create_ingress_gateway_route_table(self, create_ingress_gateway_route_table_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ingress_gateway_route_table got unknown kwargs: {extra_kwargs!r}") @@ -1318,7 +1317,7 @@ def create_ingress_gateway_route_table(self, create_ingress_gateway_route_table_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1405,7 +1404,7 @@ def create_mesh(self, create_mesh_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_mesh got unknown kwargs: {extra_kwargs!r}") @@ -1416,7 +1415,7 @@ def create_mesh(self, create_mesh_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1503,7 +1502,7 @@ def create_virtual_deployment(self, create_virtual_deployment_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_virtual_deployment got unknown kwargs: {extra_kwargs!r}") @@ -1514,7 +1513,7 @@ def create_virtual_deployment(self, create_virtual_deployment_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1601,7 +1600,7 @@ def create_virtual_service(self, create_virtual_service_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_virtual_service got unknown kwargs: {extra_kwargs!r}") @@ -1612,7 +1611,7 @@ def create_virtual_service(self, create_virtual_service_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1699,7 +1698,7 @@ def create_virtual_service_route_table(self, create_virtual_service_route_table_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_virtual_service_route_table got unknown kwargs: {extra_kwargs!r}") @@ -1710,7 +1709,7 @@ def create_virtual_service_route_table(self, create_virtual_service_route_table_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1797,7 +1796,7 @@ def delete_access_policy(self, access_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_access_policy got unknown kwargs: {extra_kwargs!r}") @@ -1806,10 +1805,10 @@ def delete_access_policy(self, access_policy_id, **kwargs): "accessPolicyId": access_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1818,7 +1817,7 @@ def delete_access_policy(self, access_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1902,7 +1901,7 @@ def delete_ingress_gateway(self, ingress_gateway_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ingress_gateway got unknown kwargs: {extra_kwargs!r}") @@ -1911,10 +1910,10 @@ def delete_ingress_gateway(self, ingress_gateway_id, **kwargs): "ingressGatewayId": ingress_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1923,7 +1922,7 @@ def delete_ingress_gateway(self, ingress_gateway_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2007,7 +2006,7 @@ def delete_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_ingress_gateway_route_table got unknown kwargs: {extra_kwargs!r}") @@ -2016,10 +2015,10 @@ def delete_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **k "ingressGatewayRouteTableId": ingress_gateway_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2028,7 +2027,7 @@ def delete_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2112,7 +2111,7 @@ def delete_mesh(self, mesh_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_mesh got unknown kwargs: {extra_kwargs!r}") @@ -2121,10 +2120,10 @@ def delete_mesh(self, mesh_id, **kwargs): "meshId": mesh_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2133,7 +2132,7 @@ def delete_mesh(self, mesh_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2217,7 +2216,7 @@ def delete_virtual_deployment(self, virtual_deployment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_virtual_deployment got unknown kwargs: {extra_kwargs!r}") @@ -2226,10 +2225,10 @@ def delete_virtual_deployment(self, virtual_deployment_id, **kwargs): "virtualDeploymentId": virtual_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2238,7 +2237,7 @@ def delete_virtual_deployment(self, virtual_deployment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2322,7 +2321,7 @@ def delete_virtual_service(self, virtual_service_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_virtual_service got unknown kwargs: {extra_kwargs!r}") @@ -2331,10 +2330,10 @@ def delete_virtual_service(self, virtual_service_id, **kwargs): "virtualServiceId": virtual_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2343,7 +2342,7 @@ def delete_virtual_service(self, virtual_service_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2427,7 +2426,7 @@ def delete_virtual_service_route_table(self, virtual_service_route_table_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_virtual_service_route_table got unknown kwargs: {extra_kwargs!r}") @@ -2436,10 +2435,10 @@ def delete_virtual_service_route_table(self, virtual_service_route_table_id, **k "virtualServiceRouteTableId": virtual_service_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2448,7 +2447,7 @@ def delete_virtual_service_route_table(self, virtual_service_route_table_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2524,7 +2523,7 @@ def get_access_policy(self, access_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_access_policy got unknown kwargs: {extra_kwargs!r}") @@ -2533,10 +2532,10 @@ def get_access_policy(self, access_policy_id, **kwargs): "accessPolicyId": access_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2544,7 +2543,7 @@ def get_access_policy(self, access_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2622,7 +2621,7 @@ def get_ingress_gateway(self, ingress_gateway_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ingress_gateway got unknown kwargs: {extra_kwargs!r}") @@ -2631,10 +2630,10 @@ def get_ingress_gateway(self, ingress_gateway_id, **kwargs): "ingressGatewayId": ingress_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2642,7 +2641,7 @@ def get_ingress_gateway(self, ingress_gateway_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2720,7 +2719,7 @@ def get_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ingress_gateway_route_table got unknown kwargs: {extra_kwargs!r}") @@ -2729,10 +2728,10 @@ def get_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **kwar "ingressGatewayRouteTableId": ingress_gateway_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2740,7 +2739,7 @@ def get_ingress_gateway_route_table(self, ingress_gateway_route_table_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2818,7 +2817,7 @@ def get_mesh(self, mesh_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mesh got unknown kwargs: {extra_kwargs!r}") @@ -2827,10 +2826,10 @@ def get_mesh(self, mesh_id, **kwargs): "meshId": mesh_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2838,7 +2837,7 @@ def get_mesh(self, mesh_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2913,7 +2912,7 @@ def get_proxy_details(self, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_proxy_details got unknown kwargs: {extra_kwargs!r}") @@ -2923,7 +2922,7 @@ def get_proxy_details(self, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2999,7 +2998,7 @@ def get_virtual_deployment(self, virtual_deployment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_deployment got unknown kwargs: {extra_kwargs!r}") @@ -3008,10 +3007,10 @@ def get_virtual_deployment(self, virtual_deployment_id, **kwargs): "virtualDeploymentId": virtual_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3019,7 +3018,7 @@ def get_virtual_deployment(self, virtual_deployment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3097,7 +3096,7 @@ def get_virtual_service(self, virtual_service_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_service got unknown kwargs: {extra_kwargs!r}") @@ -3106,10 +3105,10 @@ def get_virtual_service(self, virtual_service_id, **kwargs): "virtualServiceId": virtual_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3117,7 +3116,7 @@ def get_virtual_service(self, virtual_service_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3195,7 +3194,7 @@ def get_virtual_service_route_table(self, virtual_service_route_table_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_virtual_service_route_table got unknown kwargs: {extra_kwargs!r}") @@ -3204,10 +3203,10 @@ def get_virtual_service_route_table(self, virtual_service_route_table_id, **kwar "virtualServiceRouteTableId": virtual_service_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3215,7 +3214,7 @@ def get_virtual_service_route_table(self, virtual_service_route_table_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3293,7 +3292,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3302,10 +3301,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3313,7 +3312,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3429,7 +3428,7 @@ def list_access_policies(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_access_policies got unknown kwargs: {extra_kwargs!r}") @@ -3466,14 +3465,14 @@ def list_access_policies(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3589,7 +3588,7 @@ def list_ingress_gateway_route_tables(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ingress_gateway_route_tables got unknown kwargs: {extra_kwargs!r}") @@ -3626,14 +3625,14 @@ def list_ingress_gateway_route_tables(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3749,7 +3748,7 @@ def list_ingress_gateways(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ingress_gateways got unknown kwargs: {extra_kwargs!r}") @@ -3786,14 +3785,14 @@ def list_ingress_gateways(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3905,7 +3904,7 @@ def list_meshes(self, compartment_id, **kwargs): "lifecycle_state", "id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_meshes got unknown kwargs: {extra_kwargs!r}") @@ -3941,14 +3940,14 @@ def list_meshes(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "id": kwargs.get("id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4064,7 +4063,7 @@ def list_virtual_deployments(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_deployments got unknown kwargs: {extra_kwargs!r}") @@ -4101,14 +4100,14 @@ def list_virtual_deployments(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4224,7 +4223,7 @@ def list_virtual_service_route_tables(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_service_route_tables got unknown kwargs: {extra_kwargs!r}") @@ -4261,14 +4260,14 @@ def list_virtual_service_route_tables(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4384,7 +4383,7 @@ def list_virtual_services(self, compartment_id, **kwargs): "id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_virtual_services got unknown kwargs: {extra_kwargs!r}") @@ -4421,14 +4420,14 @@ def list_virtual_services(self, compartment_id, **kwargs): "id": kwargs.get("id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4526,7 +4525,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -4535,10 +4534,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4561,14 +4560,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4668,7 +4667,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -4677,10 +4676,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -4703,14 +4702,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4824,7 +4823,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -4860,14 +4859,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4964,7 +4963,7 @@ def update_access_policy(self, access_policy_id, update_access_policy_details, * "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_access_policy got unknown kwargs: {extra_kwargs!r}") @@ -4973,10 +4972,10 @@ def update_access_policy(self, access_policy_id, update_access_policy_details, * "accessPolicyId": access_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4986,7 +4985,7 @@ def update_access_policy(self, access_policy_id, update_access_policy_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5084,7 +5083,7 @@ def update_ingress_gateway(self, ingress_gateway_id, update_ingress_gateway_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ingress_gateway got unknown kwargs: {extra_kwargs!r}") @@ -5093,10 +5092,10 @@ def update_ingress_gateway(self, ingress_gateway_id, update_ingress_gateway_deta "ingressGatewayId": ingress_gateway_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5106,7 +5105,7 @@ def update_ingress_gateway(self, ingress_gateway_id, update_ingress_gateway_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5204,7 +5203,7 @@ def update_ingress_gateway_route_table(self, ingress_gateway_route_table_id, upd "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ingress_gateway_route_table got unknown kwargs: {extra_kwargs!r}") @@ -5213,10 +5212,10 @@ def update_ingress_gateway_route_table(self, ingress_gateway_route_table_id, upd "ingressGatewayRouteTableId": ingress_gateway_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5226,7 +5225,7 @@ def update_ingress_gateway_route_table(self, ingress_gateway_route_table_id, upd "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5324,7 +5323,7 @@ def update_mesh(self, mesh_id, update_mesh_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_mesh got unknown kwargs: {extra_kwargs!r}") @@ -5333,10 +5332,10 @@ def update_mesh(self, mesh_id, update_mesh_details, **kwargs): "meshId": mesh_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5346,7 +5345,7 @@ def update_mesh(self, mesh_id, update_mesh_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5444,7 +5443,7 @@ def update_virtual_deployment(self, virtual_deployment_id, update_virtual_deploy "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_virtual_deployment got unknown kwargs: {extra_kwargs!r}") @@ -5453,10 +5452,10 @@ def update_virtual_deployment(self, virtual_deployment_id, update_virtual_deploy "virtualDeploymentId": virtual_deployment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5466,7 +5465,7 @@ def update_virtual_deployment(self, virtual_deployment_id, update_virtual_deploy "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5564,7 +5563,7 @@ def update_virtual_service(self, virtual_service_id, update_virtual_service_deta "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_virtual_service got unknown kwargs: {extra_kwargs!r}") @@ -5573,10 +5572,10 @@ def update_virtual_service(self, virtual_service_id, update_virtual_service_deta "virtualServiceId": virtual_service_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5586,7 +5585,7 @@ def update_virtual_service(self, virtual_service_id, update_virtual_service_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5684,7 +5683,7 @@ def update_virtual_service_route_table(self, virtual_service_route_table_id, upd "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_virtual_service_route_table got unknown kwargs: {extra_kwargs!r}") @@ -5693,10 +5692,10 @@ def update_virtual_service_route_table(self, virtual_service_route_table_id, upd "virtualServiceRouteTableId": virtual_service_route_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5706,7 +5705,7 @@ def update_virtual_service_route_table(self, virtual_service_route_table_id, upd "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/signer.py b/src/oci/signer.py index 325bff5917..faa8540048 100644 --- a/src/oci/signer.py +++ b/src/oci/signer.py @@ -10,8 +10,8 @@ import io import functools import os +import urllib -from oci._vendor import six from oci.util import record_body_position_for_rewind, rewind_body, back_up_body_calculate_stream_content_length, read_stream_for_signing from ._vendor import httpsig_cffi, requests @@ -41,9 +41,9 @@ def load_private_key(secret, pass_phrase): - provided pass_phrase but didn't need one - provided a public key """ - if isinstance(secret, six.text_type): + if isinstance(secret, str): secret = secret.encode("ascii") - if isinstance(pass_phrase, six.text_type): + if isinstance(pass_phrase, str): pass_phrase = pass_phrase.encode("ascii") backend = default_backend() @@ -92,7 +92,7 @@ def inject_missing_headers(request, sign_body, enforce_content_headers): "date", email.utils.formatdate(usegmt=True)) request.headers.setdefault( - "host", six.moves.urllib.parse.urlparse(request.url).netloc) + "host", urllib.parse.urlparse(request.url).netloc) if hasattr(request.body, "buffer") or hasattr(request.body, "read"): request.headers.setdefault("content-type", "application/octet-stream") @@ -105,7 +105,7 @@ def inject_missing_headers(request, sign_body, enforce_content_headers): body = request.body or "" m = hashlib.sha256() # Handle String types - if isinstance(body, six.string_types): + if isinstance(body, str): body = body.encode("utf-8") request.headers.setdefault("content-length", str(len(body))) m.update(body) @@ -205,7 +205,7 @@ def do_request_sign(self, request, enforce_content_headers=True): inject_missing_headers(request, sign_body, enforce_content_headers) signed_headers = signer.sign( request.headers, - host=six.moves.urllib.parse.urlparse(request.url).netloc, + host=urllib.parse.urlparse(request.url).netloc, method=request.method, path=request.path_url) request.headers.update(signed_headers) diff --git a/src/oci/stack_monitoring/stack_monitoring_client.py b/src/oci/stack_monitoring/stack_monitoring_client.py index 32e88d7c4b..aacc91b96c 100644 --- a/src/oci/stack_monitoring/stack_monitoring_client.py +++ b/src/oci/stack_monitoring/stack_monitoring_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def associate_monitored_resources(self, associate_monitored_resources_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"associate_monitored_resources got unknown kwargs: {extra_kwargs!r}") @@ -189,7 +188,7 @@ def associate_monitored_resources(self, associate_monitored_resources_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -296,7 +295,7 @@ def change_config_compartment(self, config_id, change_config_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_config_compartment got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def change_config_compartment(self, config_id, change_config_compartment_details "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -318,7 +317,7 @@ def change_config_compartment(self, config_id, change_config_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -420,7 +419,7 @@ def change_metric_extension_compartment(self, metric_extension_id, change_metric "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_metric_extension_compartment got unknown kwargs: {extra_kwargs!r}") @@ -429,10 +428,10 @@ def change_metric_extension_compartment(self, metric_extension_id, change_metric "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -442,7 +441,7 @@ def change_metric_extension_compartment(self, metric_extension_id, change_metric "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -542,7 +541,7 @@ def change_monitored_resource_compartment(self, monitored_resource_id, change_mo "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_monitored_resource_compartment got unknown kwargs: {extra_kwargs!r}") @@ -551,10 +550,10 @@ def change_monitored_resource_compartment(self, monitored_resource_id, change_mo "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -564,7 +563,7 @@ def change_monitored_resource_compartment(self, monitored_resource_id, change_mo "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -663,7 +662,7 @@ def change_monitored_resource_task_compartment(self, monitored_resource_task_id, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_monitored_resource_task_compartment got unknown kwargs: {extra_kwargs!r}") @@ -672,10 +671,10 @@ def change_monitored_resource_task_compartment(self, monitored_resource_task_id, "monitoredResourceTaskId": monitored_resource_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -685,7 +684,7 @@ def change_monitored_resource_task_compartment(self, monitored_resource_task_id, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -784,7 +783,7 @@ def change_process_set_compartment(self, process_set_id, change_process_set_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_process_set_compartment got unknown kwargs: {extra_kwargs!r}") @@ -793,10 +792,10 @@ def change_process_set_compartment(self, process_set_id, change_process_set_comp "processSetId": process_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -806,7 +805,7 @@ def change_process_set_compartment(self, process_set_id, change_process_set_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -894,7 +893,7 @@ def create_baselineable_metric(self, create_baselineable_metric_details, **kwarg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_baselineable_metric got unknown kwargs: {extra_kwargs!r}") @@ -905,7 +904,7 @@ def create_baselineable_metric(self, create_baselineable_metric_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -999,7 +998,7 @@ def create_config(self, create_config_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_config got unknown kwargs: {extra_kwargs!r}") @@ -1010,7 +1009,7 @@ def create_config(self, create_config_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1098,7 +1097,7 @@ def create_discovery_job(self, create_discovery_job_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -1109,7 +1108,7 @@ def create_discovery_job(self, create_discovery_job_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1195,7 +1194,7 @@ def create_metric_extension(self, create_metric_extension_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -1206,7 +1205,7 @@ def create_metric_extension(self, create_metric_extension_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1301,7 +1300,7 @@ def create_monitored_resource(self, create_monitored_resource_details, **kwargs) "opc_request_id", "external_resource_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_monitored_resource got unknown kwargs: {extra_kwargs!r}") @@ -1313,7 +1312,7 @@ def create_monitored_resource(self, create_monitored_resource_details, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "external-resource-id": kwargs.get("external_resource_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1399,7 +1398,7 @@ def create_monitored_resource_task(self, create_monitored_resource_task_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_monitored_resource_task got unknown kwargs: {extra_kwargs!r}") @@ -1410,7 +1409,7 @@ def create_monitored_resource_task(self, create_monitored_resource_task_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1498,7 +1497,7 @@ def create_monitored_resource_type(self, create_monitored_resource_type_details, "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_monitored_resource_type got unknown kwargs: {extra_kwargs!r}") @@ -1509,7 +1508,7 @@ def create_monitored_resource_type(self, create_monitored_resource_type_details, "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1597,7 +1596,7 @@ def create_process_set(self, create_process_set_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_process_set got unknown kwargs: {extra_kwargs!r}") @@ -1608,7 +1607,7 @@ def create_process_set(self, create_process_set_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1696,7 +1695,7 @@ def delete_baselineable_metric(self, baselineable_metric_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_baselineable_metric got unknown kwargs: {extra_kwargs!r}") @@ -1705,10 +1704,10 @@ def delete_baselineable_metric(self, baselineable_metric_id, **kwargs): "baselineableMetricId": baselineable_metric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1717,7 +1716,7 @@ def delete_baselineable_metric(self, baselineable_metric_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1802,7 +1801,7 @@ def delete_config(self, config_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_config got unknown kwargs: {extra_kwargs!r}") @@ -1811,10 +1810,10 @@ def delete_config(self, config_id, **kwargs): "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1823,7 +1822,7 @@ def delete_config(self, config_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1908,7 +1907,7 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -1917,10 +1916,10 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1929,7 +1928,7 @@ def delete_discovery_job(self, discovery_job_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2016,7 +2015,7 @@ def delete_metric_extension(self, metric_extension_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -2025,10 +2024,10 @@ def delete_metric_extension(self, metric_extension_id, **kwargs): "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2037,7 +2036,7 @@ def delete_metric_extension(self, metric_extension_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2132,7 +2131,7 @@ def delete_monitored_resource(self, monitored_resource_id, **kwargs): "opc_request_id", "is_delete_members" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_monitored_resource got unknown kwargs: {extra_kwargs!r}") @@ -2141,16 +2140,16 @@ def delete_monitored_resource(self, monitored_resource_id, **kwargs): "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "isDeleteMembers": kwargs.get("is_delete_members", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2158,7 +2157,7 @@ def delete_monitored_resource(self, monitored_resource_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2247,7 +2246,7 @@ def delete_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_monitored_resource_type got unknown kwargs: {extra_kwargs!r}") @@ -2256,10 +2255,10 @@ def delete_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "monitoredResourceTypeId": monitored_resource_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2268,7 +2267,7 @@ def delete_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2351,7 +2350,7 @@ def delete_process_set(self, process_set_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_process_set got unknown kwargs: {extra_kwargs!r}") @@ -2360,10 +2359,10 @@ def delete_process_set(self, process_set_id, **kwargs): "processSetId": process_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2372,7 +2371,7 @@ def delete_process_set(self, process_set_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2468,7 +2467,7 @@ def disable_external_database(self, monitored_resource_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_external_database got unknown kwargs: {extra_kwargs!r}") @@ -2477,10 +2476,10 @@ def disable_external_database(self, monitored_resource_id, **kwargs): "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2490,7 +2489,7 @@ def disable_external_database(self, monitored_resource_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2587,7 +2586,7 @@ def disable_metric_extension(self, metric_extension_id, disable_metric_extension "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disable_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -2596,10 +2595,10 @@ def disable_metric_extension(self, metric_extension_id, disable_metric_extension "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2609,7 +2608,7 @@ def disable_metric_extension(self, metric_extension_id, disable_metric_extension "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2703,7 +2702,7 @@ def disassociate_monitored_resources(self, disassociate_monitored_resources_deta "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"disassociate_monitored_resources got unknown kwargs: {extra_kwargs!r}") @@ -2715,7 +2714,7 @@ def disassociate_monitored_resources(self, disassociate_monitored_resources_deta "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2812,7 +2811,7 @@ def enable_metric_extension(self, metric_extension_id, enable_metric_extension_d "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"enable_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -2821,10 +2820,10 @@ def enable_metric_extension(self, metric_extension_id, enable_metric_extension_d "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2834,7 +2833,7 @@ def enable_metric_extension(self, metric_extension_id, enable_metric_extension_d "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2931,7 +2930,7 @@ def evaluate_baselineable_metric(self, evaluate_baselineable_metric_details, bas "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"evaluate_baselineable_metric got unknown kwargs: {extra_kwargs!r}") @@ -2940,10 +2939,10 @@ def evaluate_baselineable_metric(self, evaluate_baselineable_metric_details, bas "baselineableMetricId": baselineable_metric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2953,7 +2952,7 @@ def evaluate_baselineable_metric(self, evaluate_baselineable_metric_details, bas "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3054,7 +3053,7 @@ def export_metric_extension(self, metric_extension_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -3063,10 +3062,10 @@ def export_metric_extension(self, metric_extension_id, **kwargs): "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3076,7 +3075,7 @@ def export_metric_extension(self, metric_extension_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3156,7 +3155,7 @@ def get_baselineable_metric(self, baselineable_metric_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_baselineable_metric got unknown kwargs: {extra_kwargs!r}") @@ -3165,10 +3164,10 @@ def get_baselineable_metric(self, baselineable_metric_id, **kwargs): "baselineableMetricId": baselineable_metric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3176,7 +3175,7 @@ def get_baselineable_metric(self, baselineable_metric_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3255,7 +3254,7 @@ def get_config(self, config_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_config got unknown kwargs: {extra_kwargs!r}") @@ -3264,10 +3263,10 @@ def get_config(self, config_id, **kwargs): "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3275,7 +3274,7 @@ def get_config(self, config_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3354,7 +3353,7 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_discovery_job got unknown kwargs: {extra_kwargs!r}") @@ -3363,10 +3362,10 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3374,7 +3373,7 @@ def get_discovery_job(self, discovery_job_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3455,7 +3454,7 @@ def get_metric_extension(self, metric_extension_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -3464,10 +3463,10 @@ def get_metric_extension(self, metric_extension_id, **kwargs): "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3475,7 +3474,7 @@ def get_metric_extension(self, metric_extension_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3558,7 +3557,7 @@ def get_monitored_resource(self, monitored_resource_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitored_resource got unknown kwargs: {extra_kwargs!r}") @@ -3567,10 +3566,10 @@ def get_monitored_resource(self, monitored_resource_id, **kwargs): "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3578,7 +3577,7 @@ def get_monitored_resource(self, monitored_resource_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3661,7 +3660,7 @@ def get_monitored_resource_task(self, monitored_resource_task_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitored_resource_task got unknown kwargs: {extra_kwargs!r}") @@ -3670,10 +3669,10 @@ def get_monitored_resource_task(self, monitored_resource_task_id, **kwargs): "monitoredResourceTaskId": monitored_resource_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3681,7 +3680,7 @@ def get_monitored_resource_task(self, monitored_resource_task_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3764,7 +3763,7 @@ def get_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_monitored_resource_type got unknown kwargs: {extra_kwargs!r}") @@ -3773,10 +3772,10 @@ def get_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "monitoredResourceTypeId": monitored_resource_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3784,7 +3783,7 @@ def get_monitored_resource_type(self, monitored_resource_type_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3863,7 +3862,7 @@ def get_process_set(self, process_set_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_process_set got unknown kwargs: {extra_kwargs!r}") @@ -3872,10 +3871,10 @@ def get_process_set(self, process_set_id, **kwargs): "processSetId": process_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3883,7 +3882,7 @@ def get_process_set(self, process_set_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3964,7 +3963,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3973,10 +3972,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3984,7 +3983,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4108,7 +4107,7 @@ def list_baselineable_metrics(self, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_baselineable_metrics got unknown kwargs: {extra_kwargs!r}") @@ -4138,14 +4137,14 @@ def list_baselineable_metrics(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4270,7 +4269,7 @@ def list_configs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_configs got unknown kwargs: {extra_kwargs!r}") @@ -4313,14 +4312,14 @@ def list_configs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4433,7 +4432,7 @@ def list_discovery_job_logs(self, discovery_job_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_job_logs got unknown kwargs: {extra_kwargs!r}") @@ -4442,10 +4441,10 @@ def list_discovery_job_logs(self, discovery_job_id, **kwargs): "discoveryJobId": discovery_job_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'log_type' in kwargs: @@ -4476,14 +4475,14 @@ def list_discovery_job_logs(self, discovery_job_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4596,7 +4595,7 @@ def list_discovery_jobs(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_discovery_jobs got unknown kwargs: {extra_kwargs!r}") @@ -4623,14 +4622,14 @@ def list_discovery_jobs(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4762,7 +4761,7 @@ def list_metric_extensions(self, compartment_id, **kwargs): "enabled_on_resource_id", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_metric_extensions got unknown kwargs: {extra_kwargs!r}") @@ -4807,14 +4806,14 @@ def list_metric_extensions(self, compartment_id, **kwargs): "lifecycleState": kwargs.get("lifecycle_state", missing), "enabledOnResourceId": kwargs.get("enabled_on_resource_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4931,7 +4930,7 @@ def list_monitored_resource_tasks(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_monitored_resource_tasks got unknown kwargs: {extra_kwargs!r}") @@ -4965,14 +4964,14 @@ def list_monitored_resource_tasks(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5134,7 +5133,7 @@ def list_monitored_resource_types(self, compartment_id, **kwargs): "fields", "exclude_fields" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_monitored_resource_types got unknown kwargs: {extra_kwargs!r}") @@ -5173,14 +5172,14 @@ def list_monitored_resource_types(self, compartment_id, **kwargs): "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi'), "excludeFields": self.base_client.generate_collection_format_param(kwargs.get("exclude_fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5302,7 +5301,7 @@ def list_monitored_resources(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_monitored_resources got unknown kwargs: {extra_kwargs!r}") @@ -5338,14 +5337,14 @@ def list_monitored_resources(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5456,7 +5455,7 @@ def list_process_sets(self, compartment_id, **kwargs): "sort_by", "display_name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_process_sets got unknown kwargs: {extra_kwargs!r}") @@ -5483,14 +5482,14 @@ def list_process_sets(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "displayName": kwargs.get("display_name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5599,7 +5598,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -5608,10 +5607,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5634,14 +5633,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5752,7 +5751,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -5761,10 +5760,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5787,14 +5786,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5917,7 +5916,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5953,14 +5952,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6064,7 +6063,7 @@ def manage_license(self, monitored_resource_id, manage_license_details, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"manage_license got unknown kwargs: {extra_kwargs!r}") @@ -6073,10 +6072,10 @@ def manage_license(self, monitored_resource_id, manage_license_details, **kwargs "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6086,7 +6085,7 @@ def manage_license(self, monitored_resource_id, manage_license_details, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6184,7 +6183,7 @@ def publish_metric_extension(self, metric_extension_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"publish_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -6193,10 +6192,10 @@ def publish_metric_extension(self, metric_extension_id, **kwargs): "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6206,7 +6205,7 @@ def publish_metric_extension(self, metric_extension_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6328,7 +6327,7 @@ def request_monitored_resources_summarized_count(self, compartment_id, **kwargs) "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_monitored_resources_summarized_count got unknown kwargs: {extra_kwargs!r}") @@ -6371,14 +6370,14 @@ def request_monitored_resources_summarized_count(self, compartment_id, **kwargs) "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6516,7 +6515,7 @@ def search_associated_resources(self, search_associated_resources_details, **kwa "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_associated_resources got unknown kwargs: {extra_kwargs!r}") @@ -6527,7 +6526,7 @@ def search_associated_resources(self, search_associated_resources_details, **kwa "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6536,7 +6535,7 @@ def search_associated_resources(self, search_associated_resources_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6650,7 +6649,7 @@ def search_monitored_resource_associations(self, search_monitored_resource_assoc "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_monitored_resource_associations got unknown kwargs: {extra_kwargs!r}") @@ -6659,7 +6658,7 @@ def search_monitored_resource_associations(self, search_monitored_resource_assoc "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6668,7 +6667,7 @@ def search_monitored_resource_associations(self, search_monitored_resource_assoc "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6801,7 +6800,7 @@ def search_monitored_resource_members(self, monitored_resource_id, search_monito "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_monitored_resource_members got unknown kwargs: {extra_kwargs!r}") @@ -6810,10 +6809,10 @@ def search_monitored_resource_members(self, monitored_resource_id, search_monito "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -6836,7 +6835,7 @@ def search_monitored_resource_members(self, monitored_resource_id, search_monito "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -6845,7 +6844,7 @@ def search_monitored_resource_members(self, monitored_resource_id, search_monito "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6987,7 +6986,7 @@ def search_monitored_resources(self, search_monitored_resources_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"search_monitored_resources got unknown kwargs: {extra_kwargs!r}") @@ -6998,7 +6997,7 @@ def search_monitored_resources(self, search_monitored_resources_details, **kwarg "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'multi'), "excludeFields": self.base_client.generate_collection_format_param(kwargs.get("exclude_fields", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -7007,7 +7006,7 @@ def search_monitored_resources(self, search_monitored_resources_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7110,7 +7109,7 @@ def test_metric_extension(self, metric_extension_id, test_metric_extension_detai "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"test_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -7119,10 +7118,10 @@ def test_metric_extension(self, metric_extension_id, test_metric_extension_detai "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7132,7 +7131,7 @@ def test_metric_extension(self, metric_extension_id, test_metric_extension_detai "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7238,7 +7237,7 @@ def update_and_propagate_tags(self, monitored_resource_id, update_and_propagate_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_and_propagate_tags got unknown kwargs: {extra_kwargs!r}") @@ -7247,10 +7246,10 @@ def update_and_propagate_tags(self, monitored_resource_id, update_and_propagate_ "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7260,7 +7259,7 @@ def update_and_propagate_tags(self, monitored_resource_id, update_and_propagate_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7351,7 +7350,7 @@ def update_baselineable_metric(self, update_baselineable_metric_details, baselin "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_baselineable_metric got unknown kwargs: {extra_kwargs!r}") @@ -7360,10 +7359,10 @@ def update_baselineable_metric(self, update_baselineable_metric_details, baselin "baselineableMetricId": baselineable_metric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7372,7 +7371,7 @@ def update_baselineable_metric(self, update_baselineable_metric_details, baselin "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7464,7 +7463,7 @@ def update_config(self, config_id, update_config_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_config got unknown kwargs: {extra_kwargs!r}") @@ -7473,10 +7472,10 @@ def update_config(self, config_id, update_config_details, **kwargs): "configId": config_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7485,7 +7484,7 @@ def update_config(self, config_id, update_config_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7579,7 +7578,7 @@ def update_metric_extension(self, metric_extension_id, update_metric_extension_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_metric_extension got unknown kwargs: {extra_kwargs!r}") @@ -7588,10 +7587,10 @@ def update_metric_extension(self, metric_extension_id, update_metric_extension_d "metricExtensionId": metric_extension_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7600,7 +7599,7 @@ def update_metric_extension(self, metric_extension_id, update_metric_extension_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7696,7 +7695,7 @@ def update_monitored_resource(self, monitored_resource_id, update_monitored_reso "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_monitored_resource got unknown kwargs: {extra_kwargs!r}") @@ -7705,10 +7704,10 @@ def update_monitored_resource(self, monitored_resource_id, update_monitored_reso "monitoredResourceId": monitored_resource_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7717,7 +7716,7 @@ def update_monitored_resource(self, monitored_resource_id, update_monitored_reso "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7809,7 +7808,7 @@ def update_monitored_resource_task(self, monitored_resource_task_id, update_moni "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_monitored_resource_task got unknown kwargs: {extra_kwargs!r}") @@ -7818,10 +7817,10 @@ def update_monitored_resource_task(self, monitored_resource_task_id, update_moni "monitoredResourceTaskId": monitored_resource_task_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7830,7 +7829,7 @@ def update_monitored_resource_task(self, monitored_resource_task_id, update_moni "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7924,7 +7923,7 @@ def update_monitored_resource_type(self, monitored_resource_type_id, update_moni "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_monitored_resource_type got unknown kwargs: {extra_kwargs!r}") @@ -7933,10 +7932,10 @@ def update_monitored_resource_type(self, monitored_resource_type_id, update_moni "monitoredResourceTypeId": monitored_resource_type_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7945,7 +7944,7 @@ def update_monitored_resource_type(self, monitored_resource_type_id, update_moni "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8035,7 +8034,7 @@ def update_process_set(self, process_set_id, update_process_set_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_process_set got unknown kwargs: {extra_kwargs!r}") @@ -8044,10 +8043,10 @@ def update_process_set(self, process_set_id, update_process_set_details, **kwarg "processSetId": process_set_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8056,7 +8055,7 @@ def update_process_set(self, process_set_id, update_process_set_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/streaming/stream_admin_client.py b/src/oci/streaming/stream_admin_client.py index 2b12521a34..6644eadd02 100644 --- a/src/oci/streaming/stream_admin_client.py +++ b/src/oci/streaming/stream_admin_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def change_connect_harness_compartment(self, connect_harness_id, change_connect_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_connect_harness_compartment got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def change_connect_harness_compartment(self, connect_harness_id, change_connect_ "connectHarnessId": connect_harness_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def change_connect_harness_compartment(self, connect_harness_id, change_connect_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -275,7 +274,7 @@ def change_stream_compartment(self, stream_id, change_stream_compartment_details "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_stream_compartment got unknown kwargs: {extra_kwargs!r}") @@ -284,10 +283,10 @@ def change_stream_compartment(self, stream_id, change_stream_compartment_details "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -296,7 +295,7 @@ def change_stream_compartment(self, stream_id, change_stream_compartment_details "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def change_stream_pool_compartment(self, stream_pool_id, change_stream_pool_comp "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_stream_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -391,10 +390,10 @@ def change_stream_pool_compartment(self, stream_pool_id, change_stream_pool_comp "streamPoolId": stream_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -403,7 +402,7 @@ def change_stream_pool_compartment(self, stream_pool_id, change_stream_pool_comp "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -487,7 +486,7 @@ def create_connect_harness(self, create_connect_harness_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_connect_harness got unknown kwargs: {extra_kwargs!r}") @@ -498,7 +497,7 @@ def create_connect_harness(self, create_connect_harness_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -582,7 +581,7 @@ def create_stream(self, create_stream_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stream got unknown kwargs: {extra_kwargs!r}") @@ -592,7 +591,7 @@ def create_stream(self, create_stream_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -677,7 +676,7 @@ def create_stream_pool(self, create_stream_pool_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_stream_pool got unknown kwargs: {extra_kwargs!r}") @@ -688,7 +687,7 @@ def create_stream_pool(self, create_stream_pool_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -776,7 +775,7 @@ def delete_connect_harness(self, connect_harness_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_connect_harness got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def delete_connect_harness(self, connect_harness_id, **kwargs): "connectHarnessId": connect_harness_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -797,7 +796,7 @@ def delete_connect_harness(self, connect_harness_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -882,7 +881,7 @@ def delete_stream(self, stream_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stream got unknown kwargs: {extra_kwargs!r}") @@ -891,10 +890,10 @@ def delete_stream(self, stream_id, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -903,7 +902,7 @@ def delete_stream(self, stream_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -985,7 +984,7 @@ def delete_stream_pool(self, stream_pool_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_stream_pool got unknown kwargs: {extra_kwargs!r}") @@ -994,10 +993,10 @@ def delete_stream_pool(self, stream_pool_id, **kwargs): "streamPoolId": stream_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1006,7 +1005,7 @@ def delete_stream_pool(self, stream_pool_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1083,7 +1082,7 @@ def get_connect_harness(self, connect_harness_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_connect_harness got unknown kwargs: {extra_kwargs!r}") @@ -1092,10 +1091,10 @@ def get_connect_harness(self, connect_harness_id, **kwargs): "connectHarnessId": connect_harness_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1103,7 +1102,7 @@ def get_connect_harness(self, connect_harness_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1182,7 +1181,7 @@ def get_stream(self, stream_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stream got unknown kwargs: {extra_kwargs!r}") @@ -1191,10 +1190,10 @@ def get_stream(self, stream_id, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1202,7 +1201,7 @@ def get_stream(self, stream_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1281,7 +1280,7 @@ def get_stream_pool(self, stream_pool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_stream_pool got unknown kwargs: {extra_kwargs!r}") @@ -1290,10 +1289,10 @@ def get_stream_pool(self, stream_pool_id, **kwargs): "streamPoolId": stream_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1301,7 +1300,7 @@ def get_stream_pool(self, stream_pool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1414,7 +1413,7 @@ def list_connect_harnesses(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_connect_harnesses got unknown kwargs: {extra_kwargs!r}") @@ -1450,14 +1449,14 @@ def list_connect_harnesses(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1570,7 +1569,7 @@ def list_stream_pools(self, compartment_id, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_stream_pools got unknown kwargs: {extra_kwargs!r}") @@ -1606,14 +1605,14 @@ def list_stream_pools(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1734,7 +1733,7 @@ def list_streams(self, **kwargs): "lifecycle_state", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_streams got unknown kwargs: {extra_kwargs!r}") @@ -1771,14 +1770,14 @@ def list_streams(self, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1864,7 +1863,7 @@ def update_connect_harness(self, connect_harness_id, update_connect_harness_deta "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_connect_harness got unknown kwargs: {extra_kwargs!r}") @@ -1873,10 +1872,10 @@ def update_connect_harness(self, connect_harness_id, update_connect_harness_deta "connectHarnessId": connect_harness_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1885,7 +1884,7 @@ def update_connect_harness(self, connect_harness_id, update_connect_harness_deta "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1973,7 +1972,7 @@ def update_stream(self, stream_id, update_stream_details, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stream got unknown kwargs: {extra_kwargs!r}") @@ -1982,10 +1981,10 @@ def update_stream(self, stream_id, update_stream_details, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1994,7 +1993,7 @@ def update_stream(self, stream_id, update_stream_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2082,7 +2081,7 @@ def update_stream_pool(self, stream_pool_id, update_stream_pool_details, **kwarg "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_stream_pool got unknown kwargs: {extra_kwargs!r}") @@ -2091,10 +2090,10 @@ def update_stream_pool(self, stream_pool_id, update_stream_pool_details, **kwarg "streamPoolId": stream_pool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2103,7 +2102,7 @@ def update_stream_pool(self, stream_pool_id, update_stream_pool_details, **kwarg "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/streaming/stream_client.py b/src/oci/streaming/stream_client.py index a5ad1ef061..ce962589de 100644 --- a/src/oci/streaming/stream_client.py +++ b/src/oci/streaming/stream_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -159,7 +158,7 @@ def consumer_commit(self, stream_id, cursor, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"consumer_commit got unknown kwargs: {extra_kwargs!r}") @@ -168,23 +167,23 @@ def consumer_commit(self, stream_id, cursor, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "cursor": cursor } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -268,7 +267,7 @@ def consumer_heartbeat(self, stream_id, cursor, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"consumer_heartbeat got unknown kwargs: {extra_kwargs!r}") @@ -277,23 +276,23 @@ def consumer_heartbeat(self, stream_id, cursor, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "cursor": cursor } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -381,7 +380,7 @@ def create_cursor(self, stream_id, create_cursor_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_cursor got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def create_cursor(self, stream_id, create_cursor_details, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -401,7 +400,7 @@ def create_cursor(self, stream_id, create_cursor_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -485,7 +484,7 @@ def create_group_cursor(self, stream_id, create_group_cursor_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_group_cursor got unknown kwargs: {extra_kwargs!r}") @@ -494,10 +493,10 @@ def create_group_cursor(self, stream_id, create_group_cursor_details, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -505,7 +504,7 @@ def create_group_cursor(self, stream_id, create_group_cursor_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def get_group(self, stream_id, group_name, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_group got unknown kwargs: {extra_kwargs!r}") @@ -599,10 +598,10 @@ def get_group(self, stream_id, group_name, **kwargs): "groupName": group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -610,7 +609,7 @@ def get_group(self, stream_id, group_name, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -699,7 +698,7 @@ def get_messages(self, stream_id, cursor, **kwargs): "limit", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_messages got unknown kwargs: {extra_kwargs!r}") @@ -708,24 +707,24 @@ def get_messages(self, stream_id, cursor, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "cursor": cursor, "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -812,7 +811,7 @@ def put_messages(self, stream_id, put_messages_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"put_messages got unknown kwargs: {extra_kwargs!r}") @@ -821,10 +820,10 @@ def put_messages(self, stream_id, put_messages_details, **kwargs): "streamId": stream_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -832,7 +831,7 @@ def put_messages(self, stream_id, put_messages_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -919,7 +918,7 @@ def update_group(self, stream_id, group_name, update_group_details, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_group got unknown kwargs: {extra_kwargs!r}") @@ -929,10 +928,10 @@ def update_group(self, stream_id, group_name, update_group_details, **kwargs): "groupName": group_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -940,7 +939,7 @@ def update_group(self, stream_id, group_name, update_group_details, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/domain_client.py b/src/oci/tenant_manager_control_plane/domain_client.py index 2b8026cf4c..575b06f7ad 100644 --- a/src/oci/tenant_manager_control_plane/domain_client.py +++ b/src/oci/tenant_manager_control_plane/domain_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_domain(self, create_domain_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_domain got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_domain(self, create_domain_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def delete_domain(self, domain_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_domain got unknown kwargs: {extra_kwargs!r}") @@ -271,10 +270,10 @@ def delete_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -283,7 +282,7 @@ def delete_domain(self, domain_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -357,7 +356,7 @@ def get_domain(self, domain_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_domain got unknown kwargs: {extra_kwargs!r}") @@ -366,10 +365,10 @@ def get_domain(self, domain_id, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -377,7 +376,7 @@ def get_domain(self, domain_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -496,7 +495,7 @@ def list_domains(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_domains got unknown kwargs: {extra_kwargs!r}") @@ -540,14 +539,14 @@ def list_domains(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -634,7 +633,7 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_domain got unknown kwargs: {extra_kwargs!r}") @@ -643,10 +642,10 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "domainId": domain_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -655,7 +654,7 @@ def update_domain(self, domain_id, update_domain_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/domain_governance_client.py b/src/oci/tenant_manager_control_plane/domain_governance_client.py index 77202b2386..0800c8a3bf 100644 --- a/src/oci/tenant_manager_control_plane/domain_governance_client.py +++ b/src/oci/tenant_manager_control_plane/domain_governance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def create_domain_governance(self, create_domain_governance_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_domain_governance got unknown kwargs: {extra_kwargs!r}") @@ -177,7 +176,7 @@ def create_domain_governance(self, create_domain_governance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -262,7 +261,7 @@ def delete_domain_governance(self, domain_governance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_domain_governance got unknown kwargs: {extra_kwargs!r}") @@ -271,10 +270,10 @@ def delete_domain_governance(self, domain_governance_id, **kwargs): "domainGovernanceId": domain_governance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -283,7 +282,7 @@ def delete_domain_governance(self, domain_governance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -357,7 +356,7 @@ def get_domain_governance(self, domain_governance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_domain_governance got unknown kwargs: {extra_kwargs!r}") @@ -366,10 +365,10 @@ def get_domain_governance(self, domain_governance_id, **kwargs): "domainGovernanceId": domain_governance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -377,7 +376,7 @@ def get_domain_governance(self, domain_governance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -494,7 +493,7 @@ def list_domain_governances(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_domain_governances got unknown kwargs: {extra_kwargs!r}") @@ -531,14 +530,14 @@ def list_domain_governances(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -625,7 +624,7 @@ def update_domain_governance(self, domain_governance_id, update_domain_governanc "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_domain_governance got unknown kwargs: {extra_kwargs!r}") @@ -634,10 +633,10 @@ def update_domain_governance(self, domain_governance_id, update_domain_governanc "domainGovernanceId": domain_governance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -646,7 +645,7 @@ def update_domain_governance(self, domain_governance_id, update_domain_governanc "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/governance_client.py b/src/oci/tenant_manager_control_plane/governance_client.py index ce8248b5b7..7a673c2e64 100644 --- a/src/oci/tenant_manager_control_plane/governance_client.py +++ b/src/oci/tenant_manager_control_plane/governance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def add_governance(self, organization_id, organization_tenancy_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"add_governance got unknown kwargs: {extra_kwargs!r}") @@ -187,10 +186,10 @@ def add_governance(self, organization_id, organization_tenancy_id, **kwargs): "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -200,7 +199,7 @@ def add_governance(self, organization_id, organization_tenancy_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -294,7 +293,7 @@ def remove_governance(self, organization_id, organization_tenancy_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"remove_governance got unknown kwargs: {extra_kwargs!r}") @@ -304,10 +303,10 @@ def remove_governance(self, organization_id, organization_tenancy_id, **kwargs): "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -317,7 +316,7 @@ def remove_governance(self, organization_id, organization_tenancy_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/link_client.py b/src/oci/tenant_manager_control_plane/link_client.py index 57f0a7e16c..d9426d33ff 100644 --- a/src/oci/tenant_manager_control_plane/link_client.py +++ b/src/oci/tenant_manager_control_plane/link_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def delete_link(self, link_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_link got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def delete_link(self, link_id, **kwargs): "linkId": link_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -187,7 +186,7 @@ def delete_link(self, link_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -261,7 +260,7 @@ def get_link(self, link_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_link got unknown kwargs: {extra_kwargs!r}") @@ -270,10 +269,10 @@ def get_link(self, link_id, **kwargs): "linkId": link_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -281,7 +280,7 @@ def get_link(self, link_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -382,7 +381,7 @@ def list_links(self, **kwargs): "limit", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_links got unknown kwargs: {extra_kwargs!r}") @@ -409,14 +408,14 @@ def list_links(self, **kwargs): "limit": kwargs.get("limit", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/orders_client.py b/src/oci/tenant_manager_control_plane/orders_client.py index 1f580c4a61..87daa0d83c 100644 --- a/src/oci/tenant_manager_control_plane/orders_client.py +++ b/src/oci/tenant_manager_control_plane/orders_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def activate_order(self, activate_order_details, activation_token, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"activate_order got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def activate_order(self, activate_order_details, activation_token, **kwargs): "activationToken": activation_token } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def activate_order(self, activate_order_details, activation_token, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -267,7 +266,7 @@ def get_order(self, activation_token, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_order got unknown kwargs: {extra_kwargs!r}") @@ -276,10 +275,10 @@ def get_order(self, activation_token, **kwargs): "activationToken": activation_token } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -287,7 +286,7 @@ def get_order(self, activation_token, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/organization_client.py b/src/oci/tenant_manager_control_plane/organization_client.py index e70a309fad..2449fdf868 100644 --- a/src/oci/tenant_manager_control_plane/organization_client.py +++ b/src/oci/tenant_manager_control_plane/organization_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def approve_organization_tenancy_for_transfer(self, compartment_id, organization "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"approve_organization_tenancy_for_transfer got unknown kwargs: {extra_kwargs!r}") @@ -186,16 +185,16 @@ def approve_organization_tenancy_for_transfer(self, compartment_id, organization "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -204,7 +203,7 @@ def approve_organization_tenancy_for_transfer(self, compartment_id, organization "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -291,7 +290,7 @@ def create_child_tenancy(self, create_child_tenancy_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_child_tenancy got unknown kwargs: {extra_kwargs!r}") @@ -302,7 +301,7 @@ def create_child_tenancy(self, create_child_tenancy_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -393,7 +392,7 @@ def delete_organization_tenancy(self, organization_tenancy_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_organization_tenancy got unknown kwargs: {extra_kwargs!r}") @@ -402,10 +401,10 @@ def delete_organization_tenancy(self, organization_tenancy_id, **kwargs): "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -415,7 +414,7 @@ def delete_organization_tenancy(self, organization_tenancy_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -490,7 +489,7 @@ def get_organization(self, organization_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_organization got unknown kwargs: {extra_kwargs!r}") @@ -499,10 +498,10 @@ def get_organization(self, organization_id, **kwargs): "organizationId": organization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -510,7 +509,7 @@ def get_organization(self, organization_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -589,7 +588,7 @@ def get_organization_tenancy(self, organization_id, tenancy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_organization_tenancy got unknown kwargs: {extra_kwargs!r}") @@ -599,10 +598,10 @@ def get_organization_tenancy(self, organization_id, tenancy_id, **kwargs): "tenancyId": tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -610,7 +609,7 @@ def get_organization_tenancy(self, organization_id, tenancy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def list_organization_tenancies(self, organization_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_organization_tenancies got unknown kwargs: {extra_kwargs!r}") @@ -703,24 +702,24 @@ def list_organization_tenancies(self, organization_id, **kwargs): "organizationId": organization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -806,7 +805,7 @@ def list_organizations(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_organizations got unknown kwargs: {extra_kwargs!r}") @@ -816,14 +815,14 @@ def list_organizations(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -907,7 +906,7 @@ def restore_organization_tenancy(self, organization_tenancy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"restore_organization_tenancy got unknown kwargs: {extra_kwargs!r}") @@ -916,10 +915,10 @@ def restore_organization_tenancy(self, organization_tenancy_id, **kwargs): "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -928,7 +927,7 @@ def restore_organization_tenancy(self, organization_tenancy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1021,7 +1020,7 @@ def unapprove_organization_tenancy_for_transfer(self, compartment_id, organizati "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unapprove_organization_tenancy_for_transfer got unknown kwargs: {extra_kwargs!r}") @@ -1030,16 +1029,16 @@ def unapprove_organization_tenancy_for_transfer(self, compartment_id, organizati "organizationTenancyId": organization_tenancy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1048,7 +1047,7 @@ def unapprove_organization_tenancy_for_transfer(self, compartment_id, organizati "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1146,7 +1145,7 @@ def update_organization(self, organization_id, update_organization_details, **kw "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_organization got unknown kwargs: {extra_kwargs!r}") @@ -1155,10 +1154,10 @@ def update_organization(self, organization_id, update_organization_details, **kw "organizationId": organization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1168,7 +1167,7 @@ def update_organization(self, organization_id, update_organization_details, **kw "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/recipient_invitation_client.py b/src/oci/tenant_manager_control_plane/recipient_invitation_client.py index 9e5490a8bf..1eee22f036 100644 --- a/src/oci/tenant_manager_control_plane/recipient_invitation_client.py +++ b/src/oci/tenant_manager_control_plane/recipient_invitation_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def accept_recipient_invitation(self, recipient_invitation_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"accept_recipient_invitation got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def accept_recipient_invitation(self, recipient_invitation_id, **kwargs): "recipientInvitationId": recipient_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def accept_recipient_invitation(self, recipient_invitation_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def get_recipient_invitation(self, recipient_invitation_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_recipient_invitation got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def get_recipient_invitation(self, recipient_invitation_id, **kwargs): "recipientInvitationId": recipient_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -291,7 +290,7 @@ def get_recipient_invitation(self, recipient_invitation_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -383,7 +382,7 @@ def ignore_recipient_invitation(self, recipient_invitation_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"ignore_recipient_invitation got unknown kwargs: {extra_kwargs!r}") @@ -392,10 +391,10 @@ def ignore_recipient_invitation(self, recipient_invitation_id, **kwargs): "recipientInvitationId": recipient_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -405,7 +404,7 @@ def ignore_recipient_invitation(self, recipient_invitation_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -502,7 +501,7 @@ def list_recipient_invitations(self, compartment_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recipient_invitations got unknown kwargs: {extra_kwargs!r}") @@ -528,14 +527,14 @@ def list_recipient_invitations(self, compartment_id, **kwargs): "compartmentId": compartment_id, "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -622,7 +621,7 @@ def update_recipient_invitation(self, recipient_invitation_id, update_recipient_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_recipient_invitation got unknown kwargs: {extra_kwargs!r}") @@ -631,10 +630,10 @@ def update_recipient_invitation(self, recipient_invitation_id, update_recipient_ "recipientInvitationId": recipient_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -643,7 +642,7 @@ def update_recipient_invitation(self, recipient_invitation_id, update_recipient_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/sender_invitation_client.py b/src/oci/tenant_manager_control_plane/sender_invitation_client.py index bc79830591..f88cfa8ff6 100644 --- a/src/oci/tenant_manager_control_plane/sender_invitation_client.py +++ b/src/oci/tenant_manager_control_plane/sender_invitation_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def cancel_sender_invitation(self, sender_invitation_id, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_sender_invitation got unknown kwargs: {extra_kwargs!r}") @@ -183,10 +182,10 @@ def cancel_sender_invitation(self, sender_invitation_id, **kwargs): "senderInvitationId": sender_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -196,7 +195,7 @@ def cancel_sender_invitation(self, sender_invitation_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -279,7 +278,7 @@ def create_sender_invitation(self, create_sender_invitation_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_sender_invitation got unknown kwargs: {extra_kwargs!r}") @@ -290,7 +289,7 @@ def create_sender_invitation(self, create_sender_invitation_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -367,7 +366,7 @@ def get_sender_invitation(self, sender_invitation_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_sender_invitation got unknown kwargs: {extra_kwargs!r}") @@ -376,10 +375,10 @@ def get_sender_invitation(self, sender_invitation_id, **kwargs): "senderInvitationId": sender_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -387,7 +386,7 @@ def get_sender_invitation(self, sender_invitation_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -506,7 +505,7 @@ def list_sender_invitations(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_sender_invitations got unknown kwargs: {extra_kwargs!r}") @@ -550,14 +549,14 @@ def list_sender_invitations(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -644,7 +643,7 @@ def update_sender_invitation(self, sender_invitation_id, update_sender_invitatio "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_sender_invitation got unknown kwargs: {extra_kwargs!r}") @@ -653,10 +652,10 @@ def update_sender_invitation(self, sender_invitation_id, update_sender_invitatio "senderInvitationId": sender_invitation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -665,7 +664,7 @@ def update_sender_invitation(self, sender_invitation_id, update_sender_invitatio "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/subscription_client.py b/src/oci/tenant_manager_control_plane/subscription_client.py index 7607d7f367..30c4597545 100644 --- a/src/oci/tenant_manager_control_plane/subscription_client.py +++ b/src/oci/tenant_manager_control_plane/subscription_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -174,7 +173,7 @@ def create_subscription_mapping(self, create_subscription_mapping_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_subscription_mapping got unknown kwargs: {extra_kwargs!r}") @@ -186,7 +185,7 @@ def create_subscription_mapping(self, create_subscription_mapping_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -271,7 +270,7 @@ def delete_subscription_mapping(self, subscription_mapping_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_subscription_mapping got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def delete_subscription_mapping(self, subscription_mapping_id, **kwargs): "subscriptionMappingId": subscription_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -292,7 +291,7 @@ def delete_subscription_mapping(self, subscription_mapping_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -366,7 +365,7 @@ def get_assigned_subscription(self, assigned_subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_assigned_subscription got unknown kwargs: {extra_kwargs!r}") @@ -375,10 +374,10 @@ def get_assigned_subscription(self, assigned_subscription_id, **kwargs): "assignedSubscriptionId": assigned_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -386,7 +385,7 @@ def get_assigned_subscription(self, assigned_subscription_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -462,7 +461,7 @@ def get_subscription(self, subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscription got unknown kwargs: {extra_kwargs!r}") @@ -471,10 +470,10 @@ def get_subscription(self, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -482,7 +481,7 @@ def get_subscription(self, subscription_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -558,7 +557,7 @@ def get_subscription_mapping(self, subscription_mapping_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_subscription_mapping got unknown kwargs: {extra_kwargs!r}") @@ -567,10 +566,10 @@ def get_subscription_mapping(self, subscription_mapping_id, **kwargs): "subscriptionMappingId": subscription_mapping_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -578,7 +577,7 @@ def get_subscription_mapping(self, subscription_mapping_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -677,7 +676,7 @@ def list_assigned_subscription_line_items(self, assigned_subscription_id, **kwar "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_assigned_subscription_line_items got unknown kwargs: {extra_kwargs!r}") @@ -686,10 +685,10 @@ def list_assigned_subscription_line_items(self, assigned_subscription_id, **kwar "assignedSubscriptionId": assigned_subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -712,14 +711,14 @@ def list_assigned_subscription_line_items(self, assigned_subscription_id, **kwar "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -832,7 +831,7 @@ def list_assigned_subscriptions(self, compartment_id, **kwargs): "sort_by", "entity_version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_assigned_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -867,14 +866,14 @@ def list_assigned_subscriptions(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "entityVersion": kwargs.get("entity_version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -954,7 +953,7 @@ def list_available_regions(self, subscription_id, **kwargs): "opc_request_id", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_available_regions got unknown kwargs: {extra_kwargs!r}") @@ -963,23 +962,23 @@ def list_available_regions(self, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1080,7 +1079,7 @@ def list_subscription_line_items(self, subscription_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscription_line_items got unknown kwargs: {extra_kwargs!r}") @@ -1089,10 +1088,10 @@ def list_subscription_line_items(self, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1115,14 +1114,14 @@ def list_subscription_line_items(self, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1239,7 +1238,7 @@ def list_subscription_mappings(self, subscription_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscription_mappings got unknown kwargs: {extra_kwargs!r}") @@ -1275,14 +1274,14 @@ def list_subscription_mappings(self, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1392,7 +1391,7 @@ def list_subscriptions(self, **kwargs): "sort_by", "entity_version" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -1427,14 +1426,14 @@ def list_subscriptions(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "entityVersion": kwargs.get("entity_version", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/tenant_manager_control_plane/work_request_client.py b/src/oci/tenant_manager_control_plane/work_request_client.py index bd9e809304..8ab8b7bba4 100644 --- a/src/oci/tenant_manager_control_plane/work_request_client.py +++ b/src/oci/tenant_manager_control_plane/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -158,7 +157,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -167,10 +166,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -178,7 +177,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -268,7 +267,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -277,10 +276,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -295,14 +294,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -394,7 +393,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -403,10 +402,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -421,14 +420,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -520,7 +519,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -538,14 +537,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/threat_intelligence/threatintel_client.py b/src/oci/threat_intelligence/threatintel_client.py index e1ec9afbee..9294df14a6 100644 --- a/src/oci/threat_intelligence/threatintel_client.py +++ b/src/oci/threat_intelligence/threatintel_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -161,7 +160,7 @@ def get_indicator(self, indicator_id, compartment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_indicator got unknown kwargs: {extra_kwargs!r}") @@ -170,23 +169,23 @@ def get_indicator(self, indicator_id, compartment_id, **kwargs): "indicatorId": indicator_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -272,7 +271,7 @@ def list_indicator_counts(self, compartment_id, **kwargs): "opc_request_id", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_indicator_counts got unknown kwargs: {extra_kwargs!r}") @@ -288,14 +287,14 @@ def list_indicator_counts(self, compartment_id, **kwargs): "compartmentId": compartment_id, "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -435,7 +434,7 @@ def list_indicators(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_indicators got unknown kwargs: {extra_kwargs!r}") @@ -478,14 +477,14 @@ def list_indicators(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -578,7 +577,7 @@ def list_threat_types(self, compartment_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_threat_types got unknown kwargs: {extra_kwargs!r}") @@ -596,14 +595,14 @@ def list_threat_types(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -692,7 +691,7 @@ def summarize_indicators(self, compartment_id, summarize_indicators_details, **k "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"summarize_indicators got unknown kwargs: {extra_kwargs!r}") @@ -702,14 +701,14 @@ def summarize_indicators(self, compartment_id, summarize_indicators_details, **k "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/usage/resources_client.py b/src/oci/usage/resources_client.py index e616f326ae..42065e9a5c 100644 --- a/src/oci/usage/resources_client.py +++ b/src/oci/usage/resources_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -186,7 +185,7 @@ def list_resource_quota(self, service_name, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resource_quota got unknown kwargs: {extra_kwargs!r}") @@ -214,14 +213,14 @@ def list_resource_quota(self, service_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -327,7 +326,7 @@ def list_resources(self, service_name, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_resources got unknown kwargs: {extra_kwargs!r}") @@ -355,14 +354,14 @@ def list_resources(self, service_name, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/usage/rewards_client.py b/src/oci/usage/rewards_client.py index f7e0a6d71d..b663834338 100644 --- a/src/oci/usage/rewards_client.py +++ b/src/oci/usage/rewards_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -184,7 +183,7 @@ def create_redeemable_user(self, create_redeemable_user_details, tenancy_id, sub "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_redeemable_user got unknown kwargs: {extra_kwargs!r}") @@ -193,17 +192,17 @@ def create_redeemable_user(self, create_redeemable_user_details, tenancy_id, sub "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "tenancyId": tenancy_id, "userId": kwargs.get("user_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -212,7 +211,7 @@ def create_redeemable_user(self, create_redeemable_user_details, tenancy_id, sub "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -307,7 +306,7 @@ def delete_redeemable_user(self, email_id, tenancy_id, subscription_id, **kwargs "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_redeemable_user got unknown kwargs: {extra_kwargs!r}") @@ -316,17 +315,17 @@ def delete_redeemable_user(self, email_id, tenancy_id, subscription_id, **kwargs "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "emailId": email_id, "tenancyId": tenancy_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -334,7 +333,7 @@ def delete_redeemable_user(self, email_id, tenancy_id, subscription_id, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -442,7 +441,7 @@ def list_products(self, tenancy_id, subscription_id, usage_period_key, **kwargs) "sort_by", "producttype" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_products got unknown kwargs: {extra_kwargs!r}") @@ -451,10 +450,10 @@ def list_products(self, tenancy_id, subscription_id, usage_period_key, **kwargs) "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -487,14 +486,14 @@ def list_products(self, tenancy_id, subscription_id, usage_period_key, **kwargs) "sortBy": kwargs.get("sort_by", missing), "producttype": kwargs.get("producttype", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -595,7 +594,7 @@ def list_redeemable_users(self, tenancy_id, subscription_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_redeemable_users got unknown kwargs: {extra_kwargs!r}") @@ -604,10 +603,10 @@ def list_redeemable_users(self, tenancy_id, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -631,14 +630,14 @@ def list_redeemable_users(self, tenancy_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -747,7 +746,7 @@ def list_redemptions(self, tenancy_id, subscription_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_redemptions got unknown kwargs: {extra_kwargs!r}") @@ -756,10 +755,10 @@ def list_redemptions(self, tenancy_id, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -785,14 +784,14 @@ def list_redemptions(self, tenancy_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -873,7 +872,7 @@ def list_rewards(self, tenancy_id, subscription_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_rewards got unknown kwargs: {extra_kwargs!r}") @@ -882,23 +881,23 @@ def list_rewards(self, tenancy_id, subscription_id, **kwargs): "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "tenancyId": tenancy_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/usage/usagelimits_client.py b/src/oci/usage/usagelimits_client.py index 01f328f57f..4c1a49bf32 100644 --- a/src/oci/usage/usagelimits_client.py +++ b/src/oci/usage/usagelimits_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -193,7 +192,7 @@ def list_usage_limits(self, compartment_id, subscription_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_usage_limits got unknown kwargs: {extra_kwargs!r}") @@ -223,14 +222,14 @@ def list_usage_limits(self, compartment_id, subscription_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/usage_api/usageapi_client.py b/src/oci/usage_api/usageapi_client.py index 37fc0852fe..ad3c01c960 100644 --- a/src/oci/usage_api/usageapi_client.py +++ b/src/oci/usage_api/usageapi_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -167,7 +166,7 @@ def create_custom_table(self, create_custom_table_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_custom_table got unknown kwargs: {extra_kwargs!r}") @@ -178,7 +177,7 @@ def create_custom_table(self, create_custom_table_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -267,7 +266,7 @@ def create_email_recipients_group(self, create_email_recipients_group_details, s "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_email_recipients_group got unknown kwargs: {extra_kwargs!r}") @@ -276,10 +275,10 @@ def create_email_recipients_group(self, create_email_recipients_group_details, s "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -288,7 +287,7 @@ def create_email_recipients_group(self, create_email_recipients_group_details, s "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -376,7 +375,7 @@ def create_query(self, create_query_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_query got unknown kwargs: {extra_kwargs!r}") @@ -387,7 +386,7 @@ def create_query(self, create_query_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -473,7 +472,7 @@ def create_schedule(self, create_schedule_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_schedule got unknown kwargs: {extra_kwargs!r}") @@ -484,7 +483,7 @@ def create_schedule(self, create_schedule_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -570,7 +569,7 @@ def create_usage_carbon_emissions_query(self, create_usage_carbon_emissions_quer "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_usage_carbon_emissions_query got unknown kwargs: {extra_kwargs!r}") @@ -581,7 +580,7 @@ def create_usage_carbon_emissions_query(self, create_usage_carbon_emissions_quer "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -667,7 +666,7 @@ def delete_custom_table(self, custom_table_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_custom_table got unknown kwargs: {extra_kwargs!r}") @@ -676,10 +675,10 @@ def delete_custom_table(self, custom_table_id, **kwargs): "customTableId": custom_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -688,7 +687,7 @@ def delete_custom_table(self, custom_table_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -777,7 +776,7 @@ def delete_email_recipients_group(self, email_recipients_group_id, subscription_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_email_recipients_group got unknown kwargs: {extra_kwargs!r}") @@ -787,16 +786,16 @@ def delete_email_recipients_group(self, email_recipients_group_id, subscription_ "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -804,7 +803,7 @@ def delete_email_recipients_group(self, email_recipients_group_id, subscription_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -889,7 +888,7 @@ def delete_query(self, query_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_query got unknown kwargs: {extra_kwargs!r}") @@ -898,10 +897,10 @@ def delete_query(self, query_id, **kwargs): "queryId": query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -910,7 +909,7 @@ def delete_query(self, query_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -993,7 +992,7 @@ def delete_schedule(self, schedule_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1002,10 +1001,10 @@ def delete_schedule(self, schedule_id, **kwargs): "scheduleId": schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1014,7 +1013,7 @@ def delete_schedule(self, schedule_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1097,7 +1096,7 @@ def delete_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, * "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_usage_carbon_emissions_query got unknown kwargs: {extra_kwargs!r}") @@ -1106,10 +1105,10 @@ def delete_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, * "usageCarbonEmissionsQueryId": usage_carbon_emissions_query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1118,7 +1117,7 @@ def delete_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, * "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1193,7 +1192,7 @@ def get_custom_table(self, custom_table_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_custom_table got unknown kwargs: {extra_kwargs!r}") @@ -1202,10 +1201,10 @@ def get_custom_table(self, custom_table_id, **kwargs): "customTableId": custom_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1213,7 +1212,7 @@ def get_custom_table(self, custom_table_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1296,7 +1295,7 @@ def get_email_recipients_group(self, email_recipients_group_id, subscription_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_email_recipients_group got unknown kwargs: {extra_kwargs!r}") @@ -1306,23 +1305,23 @@ def get_email_recipients_group(self, email_recipients_group_id, subscription_id, "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1401,7 +1400,7 @@ def get_query(self, query_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_query got unknown kwargs: {extra_kwargs!r}") @@ -1410,10 +1409,10 @@ def get_query(self, query_id, **kwargs): "queryId": query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1421,7 +1420,7 @@ def get_query(self, query_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1498,7 +1497,7 @@ def get_schedule(self, schedule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1507,10 +1506,10 @@ def get_schedule(self, schedule_id, **kwargs): "scheduleId": schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1518,7 +1517,7 @@ def get_schedule(self, schedule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1595,7 +1594,7 @@ def get_scheduled_run(self, scheduled_run_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_scheduled_run got unknown kwargs: {extra_kwargs!r}") @@ -1604,10 +1603,10 @@ def get_scheduled_run(self, scheduled_run_id, **kwargs): "scheduledRunId": scheduled_run_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1615,7 +1614,7 @@ def get_scheduled_run(self, scheduled_run_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1692,7 +1691,7 @@ def get_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, **kw "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_usage_carbon_emissions_query got unknown kwargs: {extra_kwargs!r}") @@ -1701,10 +1700,10 @@ def get_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, **kw "usageCarbonEmissionsQueryId": usage_carbon_emissions_query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1712,7 +1711,7 @@ def get_usage_carbon_emissions_query(self, usage_carbon_emissions_query_id, **kw "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1813,7 +1812,7 @@ def list_custom_tables(self, compartment_id, saved_report_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_custom_tables got unknown kwargs: {extra_kwargs!r}") @@ -1840,14 +1839,14 @@ def list_custom_tables(self, compartment_id, saved_report_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1956,7 +1955,7 @@ def list_email_recipients_groups(self, subscription_id, compartment_id, **kwargs "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_email_recipients_groups got unknown kwargs: {extra_kwargs!r}") @@ -1965,10 +1964,10 @@ def list_email_recipients_groups(self, subscription_id, compartment_id, **kwargs "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1992,7 +1991,7 @@ def list_email_recipients_groups(self, subscription_id, compartment_id, **kwargs "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2000,7 +1999,7 @@ def list_email_recipients_groups(self, subscription_id, compartment_id, **kwargs "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2101,7 +2100,7 @@ def list_queries(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_queries got unknown kwargs: {extra_kwargs!r}") @@ -2127,14 +2126,14 @@ def list_queries(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2232,7 +2231,7 @@ def list_scheduled_runs(self, schedule_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_scheduled_runs got unknown kwargs: {extra_kwargs!r}") @@ -2258,14 +2257,14 @@ def list_scheduled_runs(self, schedule_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2367,7 +2366,7 @@ def list_schedules(self, compartment_id, **kwargs): "sort_order", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_schedules got unknown kwargs: {extra_kwargs!r}") @@ -2394,14 +2393,14 @@ def list_schedules(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2499,7 +2498,7 @@ def list_usage_carbon_emissions_queries(self, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_usage_carbon_emissions_queries got unknown kwargs: {extra_kwargs!r}") @@ -2525,14 +2524,14 @@ def list_usage_carbon_emissions_queries(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2609,7 +2608,7 @@ def request_average_carbon_emission(self, sku_part_number, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_average_carbon_emission got unknown kwargs: {extra_kwargs!r}") @@ -2618,10 +2617,10 @@ def request_average_carbon_emission(self, sku_part_number, **kwargs): "skuPartNumber": sku_part_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2629,7 +2628,7 @@ def request_average_carbon_emission(self, sku_part_number, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2710,7 +2709,7 @@ def request_clean_energy_usage(self, region, **kwargs): "ad", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_clean_energy_usage got unknown kwargs: {extra_kwargs!r}") @@ -2719,23 +2718,23 @@ def request_clean_energy_usage(self, region, **kwargs): "region": region } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "ad": kwargs.get("ad", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2814,7 +2813,7 @@ def request_summarized_configurations(self, tenant_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2822,14 +2821,14 @@ def request_summarized_configurations(self, tenant_id, **kwargs): query_params = { "tenantId": tenant_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2915,7 +2914,7 @@ def request_summarized_usages(self, request_summarized_usages_details, **kwargs) "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_usages got unknown kwargs: {extra_kwargs!r}") @@ -2924,14 +2923,14 @@ def request_summarized_usages(self, request_summarized_usages_details, **kwargs) "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3010,7 +3009,7 @@ def request_usage_carbon_emission_config(self, tenant_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_usage_carbon_emission_config got unknown kwargs: {extra_kwargs!r}") @@ -3018,14 +3017,14 @@ def request_usage_carbon_emission_config(self, tenant_id, **kwargs): query_params = { "tenantId": tenant_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3111,7 +3110,7 @@ def request_usage_carbon_emissions(self, request_usage_carbon_emissions_details, "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_usage_carbon_emissions got unknown kwargs: {extra_kwargs!r}") @@ -3120,14 +3119,14 @@ def request_usage_carbon_emissions(self, request_usage_carbon_emissions_details, "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3217,7 +3216,7 @@ def update_custom_table(self, update_custom_table_details, custom_table_id, **kw "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_custom_table got unknown kwargs: {extra_kwargs!r}") @@ -3226,10 +3225,10 @@ def update_custom_table(self, update_custom_table_details, custom_table_id, **kw "customTableId": custom_table_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3238,7 +3237,7 @@ def update_custom_table(self, update_custom_table_details, custom_table_id, **kw "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3334,7 +3333,7 @@ def update_email_recipients_group(self, update_email_recipients_group_details, e "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_email_recipients_group got unknown kwargs: {extra_kwargs!r}") @@ -3344,16 +3343,16 @@ def update_email_recipients_group(self, update_email_recipients_group_details, e "subscriptionId": subscription_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "compartmentId": compartment_id } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3361,7 +3360,7 @@ def update_email_recipients_group(self, update_email_recipients_group_details, e "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3453,7 +3452,7 @@ def update_query(self, update_query_details, query_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_query got unknown kwargs: {extra_kwargs!r}") @@ -3462,10 +3461,10 @@ def update_query(self, update_query_details, query_id, **kwargs): "queryId": query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3474,7 +3473,7 @@ def update_query(self, update_query_details, query_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3564,7 +3563,7 @@ def update_schedule(self, update_schedule_details, schedule_id, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_schedule got unknown kwargs: {extra_kwargs!r}") @@ -3573,10 +3572,10 @@ def update_schedule(self, update_schedule_details, schedule_id, **kwargs): "scheduleId": schedule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3585,7 +3584,7 @@ def update_schedule(self, update_schedule_details, schedule_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3675,7 +3674,7 @@ def update_usage_carbon_emissions_query(self, update_usage_carbon_emissions_quer "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_usage_carbon_emissions_query got unknown kwargs: {extra_kwargs!r}") @@ -3684,10 +3683,10 @@ def update_usage_carbon_emissions_query(self, update_usage_carbon_emissions_quer "usageCarbonEmissionsQueryId": usage_carbon_emissions_query_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3696,7 +3695,7 @@ def update_usage_carbon_emissions_query(self, update_usage_carbon_emissions_quer "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/util.py b/src/oci/util.py index c149b00dbb..6ae5ab8e32 100644 --- a/src/oci/util.py +++ b/src/oci/util.py @@ -13,7 +13,6 @@ import pytz -from oci._vendor import six import oci.exceptions try: @@ -54,7 +53,7 @@ def to_dict(obj): are converted into ISO8601 UTC strings """ # Shortcut strings so they don't count as Iterables - if isinstance(obj, six.string_types): + if isinstance(obj, str): return obj elif obj is NONE_SENTINEL: return None @@ -70,7 +69,7 @@ def to_dict(obj): # datetime.date doesn't have a timezone return obj.isoformat() elif isinstance(obj, abc.Mapping): - return {k: to_dict(v) for k, v in six.iteritems(obj)} + return {k: to_dict(v) for k, v in obj.items()} elif isinstance(obj, abc.Iterable): return [to_dict(v) for v in obj] # Not a string, datetime, dict, list, or model - return directly @@ -79,7 +78,7 @@ def to_dict(obj): # Collect attrs from obj according to swagger_types into a dict as_dict = {} - for key in six.iterkeys(obj.swagger_types): + for key in obj.swagger_types.keys(): value = getattr(obj, key, missing_attr) if value is not missing_attr: as_dict[key] = to_dict(value) diff --git a/src/oci/vault/vaults_client.py b/src/oci/vault/vaults_client.py index 6579055ef6..776efeee9c 100644 --- a/src/oci/vault/vaults_client.py +++ b/src/oci/vault/vaults_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def cancel_secret_deletion(self, secret_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_secret_deletion got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def cancel_secret_deletion(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -191,7 +190,7 @@ def cancel_secret_deletion(self, secret_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -277,7 +276,7 @@ def cancel_secret_rotation(self, secret_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_secret_rotation got unknown kwargs: {extra_kwargs!r}") @@ -286,10 +285,10 @@ def cancel_secret_rotation(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -298,7 +297,7 @@ def cancel_secret_rotation(self, secret_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -387,7 +386,7 @@ def cancel_secret_version_deletion(self, secret_id, secret_version_number, **kwa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_secret_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -397,10 +396,10 @@ def cancel_secret_version_deletion(self, secret_id, secret_version_number, **kwa "secretVersionNumber": secret_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -409,7 +408,7 @@ def cancel_secret_version_deletion(self, secret_id, secret_version_number, **kwa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -510,7 +509,7 @@ def change_secret_compartment(self, secret_id, change_secret_compartment_details "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_secret_compartment got unknown kwargs: {extra_kwargs!r}") @@ -519,10 +518,10 @@ def change_secret_compartment(self, secret_id, change_secret_compartment_details "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -532,7 +531,7 @@ def change_secret_compartment(self, secret_id, change_secret_compartment_details "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -622,7 +621,7 @@ def create_secret(self, create_secret_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_secret got unknown kwargs: {extra_kwargs!r}") @@ -633,7 +632,7 @@ def create_secret(self, create_secret_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -714,7 +713,7 @@ def get_secret(self, secret_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_secret got unknown kwargs: {extra_kwargs!r}") @@ -723,10 +722,10 @@ def get_secret(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -734,7 +733,7 @@ def get_secret(self, secret_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -817,7 +816,7 @@ def get_secret_version(self, secret_id, secret_version_number, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_secret_version got unknown kwargs: {extra_kwargs!r}") @@ -827,10 +826,10 @@ def get_secret_version(self, secret_id, secret_version_number, **kwargs): "secretVersionNumber": secret_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -838,7 +837,7 @@ def get_secret_version(self, secret_id, secret_version_number, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -939,7 +938,7 @@ def list_secret_versions(self, secret_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_secret_versions got unknown kwargs: {extra_kwargs!r}") @@ -948,10 +947,10 @@ def list_secret_versions(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -974,14 +973,14 @@ def list_secret_versions(self, secret_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1099,7 +1098,7 @@ def list_secrets(self, compartment_id, **kwargs): "vault_id", "lifecycle_state" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_secrets got unknown kwargs: {extra_kwargs!r}") @@ -1135,14 +1134,14 @@ def list_secrets(self, compartment_id, **kwargs): "vaultId": kwargs.get("vault_id", missing), "lifecycleState": kwargs.get("lifecycle_state", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1239,7 +1238,7 @@ def rotate_secret(self, secret_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"rotate_secret got unknown kwargs: {extra_kwargs!r}") @@ -1248,10 +1247,10 @@ def rotate_secret(self, secret_id, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1261,7 +1260,7 @@ def rotate_secret(self, secret_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1352,7 +1351,7 @@ def schedule_secret_deletion(self, secret_id, schedule_secret_deletion_details, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_secret_deletion got unknown kwargs: {extra_kwargs!r}") @@ -1361,10 +1360,10 @@ def schedule_secret_deletion(self, secret_id, schedule_secret_deletion_details, "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1373,7 +1372,7 @@ def schedule_secret_deletion(self, secret_id, schedule_secret_deletion_details, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1466,7 +1465,7 @@ def schedule_secret_version_deletion(self, secret_id, secret_version_number, sch "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"schedule_secret_version_deletion got unknown kwargs: {extra_kwargs!r}") @@ -1476,10 +1475,10 @@ def schedule_secret_version_deletion(self, secret_id, secret_version_number, sch "secretVersionNumber": secret_version_number } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1488,7 +1487,7 @@ def schedule_secret_version_deletion(self, secret_id, secret_version_number, sch "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1582,7 +1581,7 @@ def update_secret(self, secret_id, update_secret_details, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_secret got unknown kwargs: {extra_kwargs!r}") @@ -1591,10 +1590,10 @@ def update_secret(self, secret_id, update_secret_details, **kwargs): "secretId": secret_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1603,7 +1602,7 @@ def update_secret(self, secret_id, update_secret_details, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/vbs_inst/vbs_instance_client.py b/src/oci/vbs_inst/vbs_instance_client.py index 2244fd2e9d..c62c7bc3ae 100644 --- a/src/oci/vbs_inst/vbs_instance_client.py +++ b/src/oci/vbs_inst/vbs_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -169,7 +168,7 @@ def change_vbs_instance_compartment(self, vbs_instance_id, change_vbs_instance_c "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vbs_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def change_vbs_instance_compartment(self, vbs_instance_id, change_vbs_instance_c "vbsInstanceId": vbs_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -190,7 +189,7 @@ def change_vbs_instance_compartment(self, vbs_instance_id, change_vbs_instance_c "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def create_vbs_instance(self, create_vbs_instance_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vbs_instance got unknown kwargs: {extra_kwargs!r}") @@ -290,7 +289,7 @@ def create_vbs_instance(self, create_vbs_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -373,7 +372,7 @@ def delete_vbs_instance(self, vbs_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vbs_instance got unknown kwargs: {extra_kwargs!r}") @@ -382,10 +381,10 @@ def delete_vbs_instance(self, vbs_instance_id, **kwargs): "vbsInstanceId": vbs_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -394,7 +393,7 @@ def delete_vbs_instance(self, vbs_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -468,7 +467,7 @@ def get_vbs_instance(self, vbs_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vbs_instance got unknown kwargs: {extra_kwargs!r}") @@ -477,10 +476,10 @@ def get_vbs_instance(self, vbs_instance_id, **kwargs): "vbsInstanceId": vbs_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -488,7 +487,7 @@ def get_vbs_instance(self, vbs_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -564,7 +563,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -573,10 +572,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -584,7 +583,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -694,7 +693,7 @@ def list_vbs_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vbs_instances got unknown kwargs: {extra_kwargs!r}") @@ -730,14 +729,14 @@ def list_vbs_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -833,7 +832,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -842,10 +841,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -868,14 +867,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -973,7 +972,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -982,10 +981,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_by' in kwargs: @@ -1008,14 +1007,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1117,7 +1116,7 @@ def list_work_requests(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1144,14 +1143,14 @@ def list_work_requests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1238,7 +1237,7 @@ def update_vbs_instance(self, vbs_instance_id, update_vbs_instance_details, **kw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vbs_instance got unknown kwargs: {extra_kwargs!r}") @@ -1247,10 +1246,10 @@ def update_vbs_instance(self, vbs_instance_id, update_vbs_instance_details, **kw "vbsInstanceId": vbs_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1259,7 +1258,7 @@ def update_vbs_instance(self, vbs_instance_id, update_vbs_instance_details, **kw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/visual_builder/vb_instance_client.py b/src/oci/visual_builder/vb_instance_client.py index ab2c5341a3..a5ff0bb226 100644 --- a/src/oci/visual_builder/vb_instance_client.py +++ b/src/oci/visual_builder/vb_instance_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -179,7 +178,7 @@ def change_vb_instance_compartment(self, vb_instance_id, change_vb_instance_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_vb_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_vb_instance_compartment(self, vb_instance_id, change_vb_instance_comp "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -201,7 +200,7 @@ def change_vb_instance_compartment(self, vb_instance_id, change_vb_instance_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -287,7 +286,7 @@ def create_vb_instance(self, create_vb_instance_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -298,7 +297,7 @@ def create_vb_instance(self, create_vb_instance_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -381,7 +380,7 @@ def delete_vb_instance(self, vb_instance_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def delete_vb_instance(self, vb_instance_id, **kwargs): "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -402,7 +401,7 @@ def delete_vb_instance(self, vb_instance_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -476,7 +475,7 @@ def get_vb_instance(self, vb_instance_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -485,10 +484,10 @@ def get_vb_instance(self, vb_instance_id, **kwargs): "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -496,7 +495,7 @@ def get_vb_instance(self, vb_instance_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -574,7 +573,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -583,10 +582,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -594,7 +593,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -706,7 +705,7 @@ def list_vb_instances(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vb_instances got unknown kwargs: {extra_kwargs!r}") @@ -741,14 +740,14 @@ def list_vb_instances(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -837,7 +836,7 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -846,10 +845,10 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -857,14 +856,14 @@ def list_work_request_errors(self, compartment_id, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -955,7 +954,7 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -964,10 +963,10 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -975,14 +974,14 @@ def list_work_request_logs(self, compartment_id, work_request_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1074,7 +1073,7 @@ def list_work_requests(self, compartment_id, **kwargs): "limit", "vb_instance_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1085,14 +1084,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "vbInstanceId": kwargs.get("vb_instance_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1190,7 +1189,7 @@ def request_summarized_applications(self, request_summarized_applications_detail "if_match", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"request_summarized_applications got unknown kwargs: {extra_kwargs!r}") @@ -1199,10 +1198,10 @@ def request_summarized_applications(self, request_summarized_applications_detail "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1212,7 +1211,7 @@ def request_summarized_applications(self, request_summarized_applications_detail "if-match": kwargs.get("if_match", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1309,7 +1308,7 @@ def start_vb_instance(self, vb_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"start_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -1318,10 +1317,10 @@ def start_vb_instance(self, vb_instance_id, **kwargs): "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1331,7 +1330,7 @@ def start_vb_instance(self, vb_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1424,7 +1423,7 @@ def stop_vb_instance(self, vb_instance_id, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"stop_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -1433,10 +1432,10 @@ def stop_vb_instance(self, vb_instance_id, **kwargs): "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1446,7 +1445,7 @@ def stop_vb_instance(self, vb_instance_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1532,7 +1531,7 @@ def update_vb_instance(self, vb_instance_id, update_vb_instance_details, **kwarg "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -1541,10 +1540,10 @@ def update_vb_instance(self, vb_instance_id, update_vb_instance_details, **kwarg "vbInstanceId": vb_instance_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1553,7 +1552,7 @@ def update_vb_instance(self, vb_instance_id, update_vb_instance_details, **kwarg "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/vn_monitoring/vn_monitoring_client.py b/src/oci/vn_monitoring/vn_monitoring_client.py index c90c64e994..369813733b 100644 --- a/src/oci/vn_monitoring/vn_monitoring_client.py +++ b/src/oci/vn_monitoring/vn_monitoring_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -171,7 +170,7 @@ def change_path_analyzer_test_compartment(self, path_analyzer_test_id, change_pa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_path_analyzer_test_compartment got unknown kwargs: {extra_kwargs!r}") @@ -180,10 +179,10 @@ def change_path_analyzer_test_compartment(self, path_analyzer_test_id, change_pa "pathAnalyzerTestId": path_analyzer_test_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -192,7 +191,7 @@ def change_path_analyzer_test_compartment(self, path_analyzer_test_id, change_pa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -277,7 +276,7 @@ def create_path_analyzer_test(self, create_path_analyzer_test_details, **kwargs) "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_path_analyzer_test got unknown kwargs: {extra_kwargs!r}") @@ -288,7 +287,7 @@ def create_path_analyzer_test(self, create_path_analyzer_test_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -374,7 +373,7 @@ def delete_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_path_analyzer_test got unknown kwargs: {extra_kwargs!r}") @@ -383,10 +382,10 @@ def delete_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "pathAnalyzerTestId": path_analyzer_test_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -395,7 +394,7 @@ def delete_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -492,7 +491,7 @@ def get_path_analysis(self, get_path_analysis_details, **kwargs): "opc_request_id", "cache_control" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_path_analysis got unknown kwargs: {extra_kwargs!r}") @@ -504,7 +503,7 @@ def get_path_analysis(self, get_path_analysis_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "cache-control": kwargs.get("cache_control", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -582,7 +581,7 @@ def get_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_path_analyzer_test got unknown kwargs: {extra_kwargs!r}") @@ -591,10 +590,10 @@ def get_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "pathAnalyzerTestId": path_analyzer_test_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -602,7 +601,7 @@ def get_path_analyzer_test(self, path_analyzer_test_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -681,7 +680,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -690,10 +689,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -701,7 +700,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -828,7 +827,7 @@ def list_path_analyzer_tests(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_path_analyzer_tests got unknown kwargs: {extra_kwargs!r}") @@ -863,14 +862,14 @@ def list_path_analyzer_tests(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -980,7 +979,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -989,10 +988,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1015,14 +1014,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1134,7 +1133,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1143,10 +1142,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -1169,14 +1168,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1282,7 +1281,7 @@ def list_work_request_results(self, work_request_id, **kwargs): "page", "result_type" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_results got unknown kwargs: {extra_kwargs!r}") @@ -1291,10 +1290,10 @@ def list_work_request_results(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'result_type' in kwargs: @@ -1309,14 +1308,14 @@ def list_work_request_results(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "resultType": kwargs.get("result_type", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1442,7 +1441,7 @@ def list_work_requests(self, compartment_id, **kwargs): "status", "resource_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1478,14 +1477,14 @@ def list_work_requests(self, compartment_id, **kwargs): "status": kwargs.get("status", missing), "resourceId": kwargs.get("resource_id", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1581,7 +1580,7 @@ def update_path_analyzer_test(self, path_analyzer_test_id, update_path_analyzer_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_path_analyzer_test got unknown kwargs: {extra_kwargs!r}") @@ -1590,10 +1589,10 @@ def update_path_analyzer_test(self, path_analyzer_test_id, update_path_analyzer_ "pathAnalyzerTestId": path_analyzer_test_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1603,7 +1602,7 @@ def update_path_analyzer_test(self, path_analyzer_test_id, update_path_analyzer_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/vulnerability_scanning/vulnerability_scanning_client.py b/src/oci/vulnerability_scanning/vulnerability_scanning_client.py index 777969b0db..1e5b673a21 100644 --- a/src/oci/vulnerability_scanning/vulnerability_scanning_client.py +++ b/src/oci/vulnerability_scanning/vulnerability_scanning_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -177,7 +176,7 @@ def change_container_scan_recipe_compartment(self, container_scan_recipe_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_container_scan_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -186,10 +185,10 @@ def change_container_scan_recipe_compartment(self, container_scan_recipe_id, cha "containerScanRecipeId": container_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -199,7 +198,7 @@ def change_container_scan_recipe_compartment(self, container_scan_recipe_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -295,7 +294,7 @@ def change_container_scan_result_compartment(self, container_scan_result_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_container_scan_result_compartment got unknown kwargs: {extra_kwargs!r}") @@ -304,10 +303,10 @@ def change_container_scan_result_compartment(self, container_scan_result_id, cha "containerScanResultId": container_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -317,7 +316,7 @@ def change_container_scan_result_compartment(self, container_scan_result_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -413,7 +412,7 @@ def change_container_scan_target_compartment(self, container_scan_target_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_container_scan_target_compartment got unknown kwargs: {extra_kwargs!r}") @@ -422,10 +421,10 @@ def change_container_scan_target_compartment(self, container_scan_target_id, cha "containerScanTargetId": container_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -435,7 +434,7 @@ def change_container_scan_target_compartment(self, container_scan_target_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -531,7 +530,7 @@ def change_host_agent_scan_result_compartment(self, host_agent_scan_result_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_agent_scan_result_compartment got unknown kwargs: {extra_kwargs!r}") @@ -540,10 +539,10 @@ def change_host_agent_scan_result_compartment(self, host_agent_scan_result_id, c "hostAgentScanResultId": host_agent_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -553,7 +552,7 @@ def change_host_agent_scan_result_compartment(self, host_agent_scan_result_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -649,7 +648,7 @@ def change_host_cis_benchmark_scan_result_compartment(self, host_cis_benchmark_s "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_cis_benchmark_scan_result_compartment got unknown kwargs: {extra_kwargs!r}") @@ -658,10 +657,10 @@ def change_host_cis_benchmark_scan_result_compartment(self, host_cis_benchmark_s "hostCisBenchmarkScanResultId": host_cis_benchmark_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -671,7 +670,7 @@ def change_host_cis_benchmark_scan_result_compartment(self, host_cis_benchmark_s "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -767,7 +766,7 @@ def change_host_endpoint_protection_scan_result_compartment(self, host_endpoint_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_endpoint_protection_scan_result_compartment got unknown kwargs: {extra_kwargs!r}") @@ -776,10 +775,10 @@ def change_host_endpoint_protection_scan_result_compartment(self, host_endpoint_ "hostEndpointProtectionScanResultId": host_endpoint_protection_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -789,7 +788,7 @@ def change_host_endpoint_protection_scan_result_compartment(self, host_endpoint_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -885,7 +884,7 @@ def change_host_port_scan_result_compartment(self, host_port_scan_result_id, cha "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_port_scan_result_compartment got unknown kwargs: {extra_kwargs!r}") @@ -894,10 +893,10 @@ def change_host_port_scan_result_compartment(self, host_port_scan_result_id, cha "hostPortScanResultId": host_port_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -907,7 +906,7 @@ def change_host_port_scan_result_compartment(self, host_port_scan_result_id, cha "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1003,7 +1002,7 @@ def change_host_scan_recipe_compartment(self, host_scan_recipe_id, change_host_s "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_scan_recipe_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1012,10 +1011,10 @@ def change_host_scan_recipe_compartment(self, host_scan_recipe_id, change_host_s "hostScanRecipeId": host_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1025,7 +1024,7 @@ def change_host_scan_recipe_compartment(self, host_scan_recipe_id, change_host_s "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1121,7 +1120,7 @@ def change_host_scan_target_compartment(self, host_scan_target_id, change_host_s "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_host_scan_target_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1130,10 +1129,10 @@ def change_host_scan_target_compartment(self, host_scan_target_id, change_host_s "hostScanTargetId": host_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1143,7 +1142,7 @@ def change_host_scan_target_compartment(self, host_scan_target_id, change_host_s "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1228,7 +1227,7 @@ def create_container_scan_recipe(self, create_container_scan_recipe_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_container_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1239,7 +1238,7 @@ def create_container_scan_recipe(self, create_container_scan_recipe_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1324,7 +1323,7 @@ def create_container_scan_target(self, create_container_scan_target_details, **k "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_container_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -1335,7 +1334,7 @@ def create_container_scan_target(self, create_container_scan_target_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1420,7 +1419,7 @@ def create_host_scan_recipe(self, create_host_scan_recipe_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_host_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1431,7 +1430,7 @@ def create_host_scan_recipe(self, create_host_scan_recipe_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1516,7 +1515,7 @@ def create_host_scan_target(self, create_host_scan_target_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_host_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -1527,7 +1526,7 @@ def create_host_scan_target(self, create_host_scan_target_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1612,7 +1611,7 @@ def delete_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -1621,10 +1620,10 @@ def delete_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "containerScanRecipeId": container_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1633,7 +1632,7 @@ def delete_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1715,7 +1714,7 @@ def delete_container_scan_result(self, container_scan_result_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -1724,10 +1723,10 @@ def delete_container_scan_result(self, container_scan_result_id, **kwargs): "containerScanResultId": container_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1736,7 +1735,7 @@ def delete_container_scan_result(self, container_scan_result_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1818,7 +1817,7 @@ def delete_container_scan_target(self, container_scan_target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_container_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -1827,10 +1826,10 @@ def delete_container_scan_target(self, container_scan_target_id, **kwargs): "containerScanTargetId": container_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1839,7 +1838,7 @@ def delete_container_scan_target(self, container_scan_target_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1921,7 +1920,7 @@ def delete_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_agent_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -1930,10 +1929,10 @@ def delete_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "hostAgentScanResultId": host_agent_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1942,7 +1941,7 @@ def delete_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2024,7 +2023,7 @@ def delete_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_i "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_cis_benchmark_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -2033,10 +2032,10 @@ def delete_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_i "hostCisBenchmarkScanResultId": host_cis_benchmark_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2045,7 +2044,7 @@ def delete_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_i "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2127,7 +2126,7 @@ def delete_host_endpoint_protection_scan_result(self, host_endpoint_protection_s "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_endpoint_protection_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -2136,10 +2135,10 @@ def delete_host_endpoint_protection_scan_result(self, host_endpoint_protection_s "hostEndpointProtectionScanResultId": host_endpoint_protection_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2148,7 +2147,7 @@ def delete_host_endpoint_protection_scan_result(self, host_endpoint_protection_s "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2230,7 +2229,7 @@ def delete_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_port_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -2239,10 +2238,10 @@ def delete_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "hostPortScanResultId": host_port_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2251,7 +2250,7 @@ def delete_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2333,7 +2332,7 @@ def delete_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2342,10 +2341,10 @@ def delete_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "hostScanRecipeId": host_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2354,7 +2353,7 @@ def delete_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2436,7 +2435,7 @@ def delete_host_scan_target(self, host_scan_target_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_host_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -2445,10 +2444,10 @@ def delete_host_scan_target(self, host_scan_target_id, **kwargs): "hostScanTargetId": host_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2457,7 +2456,7 @@ def delete_host_scan_target(self, host_scan_target_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2531,7 +2530,7 @@ def export_host_agent_scan_result_csv(self, export_host_agent_scan_result_csv_de "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_host_agent_scan_result_csv got unknown kwargs: {extra_kwargs!r}") @@ -2541,7 +2540,7 @@ def export_host_agent_scan_result_csv(self, export_host_agent_scan_result_csv_de "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2617,7 +2616,7 @@ def export_host_vulnerability_csv(self, export_host_vulnerability_csv_details, * "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"export_host_vulnerability_csv got unknown kwargs: {extra_kwargs!r}") @@ -2627,7 +2626,7 @@ def export_host_vulnerability_csv(self, export_host_vulnerability_csv_details, * "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2703,7 +2702,7 @@ def get_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -2712,10 +2711,10 @@ def get_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "containerScanRecipeId": container_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2723,7 +2722,7 @@ def get_container_scan_recipe(self, container_scan_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2799,7 +2798,7 @@ def get_container_scan_result(self, container_scan_result_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -2808,10 +2807,10 @@ def get_container_scan_result(self, container_scan_result_id, **kwargs): "containerScanResultId": container_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2819,7 +2818,7 @@ def get_container_scan_result(self, container_scan_result_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2895,7 +2894,7 @@ def get_container_scan_target(self, container_scan_target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_container_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -2904,10 +2903,10 @@ def get_container_scan_target(self, container_scan_target_id, **kwargs): "containerScanTargetId": container_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2915,7 +2914,7 @@ def get_container_scan_target(self, container_scan_target_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2991,7 +2990,7 @@ def get_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_agent_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -3000,10 +2999,10 @@ def get_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "hostAgentScanResultId": host_agent_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3011,7 +3010,7 @@ def get_host_agent_scan_result(self, host_agent_scan_result_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3087,7 +3086,7 @@ def get_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_id, "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_cis_benchmark_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -3096,10 +3095,10 @@ def get_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_id, "hostCisBenchmarkScanResultId": host_cis_benchmark_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3107,7 +3106,7 @@ def get_host_cis_benchmark_scan_result(self, host_cis_benchmark_scan_result_id, "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3183,7 +3182,7 @@ def get_host_endpoint_protection_scan_result(self, host_endpoint_protection_scan "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_endpoint_protection_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -3192,10 +3191,10 @@ def get_host_endpoint_protection_scan_result(self, host_endpoint_protection_scan "hostEndpointProtectionScanResultId": host_endpoint_protection_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3203,7 +3202,7 @@ def get_host_endpoint_protection_scan_result(self, host_endpoint_protection_scan "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3279,7 +3278,7 @@ def get_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_port_scan_result got unknown kwargs: {extra_kwargs!r}") @@ -3288,10 +3287,10 @@ def get_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "hostPortScanResultId": host_port_scan_result_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3299,7 +3298,7 @@ def get_host_port_scan_result(self, host_port_scan_result_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3375,7 +3374,7 @@ def get_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -3384,10 +3383,10 @@ def get_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "hostScanRecipeId": host_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3395,7 +3394,7 @@ def get_host_scan_recipe(self, host_scan_recipe_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3471,7 +3470,7 @@ def get_host_scan_target(self, host_scan_target_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -3480,10 +3479,10 @@ def get_host_scan_target(self, host_scan_target_id, **kwargs): "hostScanTargetId": host_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3491,7 +3490,7 @@ def get_host_scan_target(self, host_scan_target_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3567,7 +3566,7 @@ def get_host_vulnerability(self, host_vulnerability_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_host_vulnerability got unknown kwargs: {extra_kwargs!r}") @@ -3576,10 +3575,10 @@ def get_host_vulnerability(self, host_vulnerability_id, **kwargs): "hostVulnerabilityId": host_vulnerability_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3587,7 +3586,7 @@ def get_host_vulnerability(self, host_vulnerability_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3663,7 +3662,7 @@ def get_vulnerability(self, vulnerability_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_vulnerability got unknown kwargs: {extra_kwargs!r}") @@ -3672,10 +3671,10 @@ def get_vulnerability(self, vulnerability_id, **kwargs): "vulnerabilityId": vulnerability_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3683,7 +3682,7 @@ def get_vulnerability(self, vulnerability_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3759,7 +3758,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -3768,10 +3767,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3779,7 +3778,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3885,7 +3884,7 @@ def list_container_scan_recipes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_scan_recipes got unknown kwargs: {extra_kwargs!r}") @@ -3920,14 +3919,14 @@ def list_container_scan_recipes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4057,7 +4056,7 @@ def list_container_scan_results(self, compartment_id, **kwargs): "opc_request_id", "is_latest_only" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -4097,14 +4096,14 @@ def list_container_scan_results(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "isLatestOnly": kwargs.get("is_latest_only", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4210,7 +4209,7 @@ def list_container_scan_targets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_container_scan_targets got unknown kwargs: {extra_kwargs!r}") @@ -4245,14 +4244,14 @@ def list_container_scan_targets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4382,7 +4381,7 @@ def list_host_agent_scan_results(self, compartment_id, **kwargs): "display_name", "is_latest_only" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_agent_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -4422,14 +4421,14 @@ def list_host_agent_scan_results(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "isLatestOnly": kwargs.get("is_latest_only", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4555,7 +4554,7 @@ def list_host_cis_benchmark_scan_results(self, compartment_id, **kwargs): "display_name", "is_latest_only" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_cis_benchmark_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -4594,14 +4593,14 @@ def list_host_cis_benchmark_scan_results(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "isLatestOnly": kwargs.get("is_latest_only", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4727,7 +4726,7 @@ def list_host_endpoint_protection_scan_results(self, compartment_id, **kwargs): "display_name", "is_latest_only" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_endpoint_protection_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -4766,14 +4765,14 @@ def list_host_endpoint_protection_scan_results(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "isLatestOnly": kwargs.get("is_latest_only", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4899,7 +4898,7 @@ def list_host_port_scan_results(self, compartment_id, **kwargs): "display_name", "is_latest_only" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_port_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -4938,14 +4937,14 @@ def list_host_port_scan_results(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "isLatestOnly": kwargs.get("is_latest_only", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5051,7 +5050,7 @@ def list_host_scan_recipes(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_scan_recipes got unknown kwargs: {extra_kwargs!r}") @@ -5086,14 +5085,14 @@ def list_host_scan_recipes(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5198,7 +5197,7 @@ def list_host_scan_target_errors(self, compartment_id, host_scan_target_id, **kw "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_scan_target_errors got unknown kwargs: {extra_kwargs!r}") @@ -5207,10 +5206,10 @@ def list_host_scan_target_errors(self, compartment_id, host_scan_target_id, **kw "hostScanTargetId": host_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'lifecycle_state' in kwargs: @@ -5242,14 +5241,14 @@ def list_host_scan_target_errors(self, compartment_id, host_scan_target_id, **kw "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5357,7 +5356,7 @@ def list_host_scan_targets(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_scan_targets got unknown kwargs: {extra_kwargs!r}") @@ -5392,14 +5391,14 @@ def list_host_scan_targets(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5515,7 +5514,7 @@ def list_host_vulnerabilities(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_vulnerabilities got unknown kwargs: {extra_kwargs!r}") @@ -5559,14 +5558,14 @@ def list_host_vulnerabilities(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5662,7 +5661,7 @@ def list_host_vulnerability_impacted_hosts(self, host_vulnerability_id, **kwargs "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_host_vulnerability_impacted_hosts got unknown kwargs: {extra_kwargs!r}") @@ -5671,10 +5670,10 @@ def list_host_vulnerability_impacted_hosts(self, host_vulnerability_id, **kwargs "hostVulnerabilityId": host_vulnerability_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -5697,14 +5696,14 @@ def list_host_vulnerability_impacted_hosts(self, host_vulnerability_id, **kwargs "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5822,7 +5821,7 @@ def list_vulnerabilities(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vulnerabilities got unknown kwargs: {extra_kwargs!r}") @@ -5866,14 +5865,14 @@ def list_vulnerabilities(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5969,7 +5968,7 @@ def list_vulnerability_impacted_containers(self, vulnerability_id, **kwargs): "opc_request_id", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vulnerability_impacted_containers got unknown kwargs: {extra_kwargs!r}") @@ -5978,10 +5977,10 @@ def list_vulnerability_impacted_containers(self, vulnerability_id, **kwargs): "vulnerabilityId": vulnerability_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6004,14 +6003,14 @@ def list_vulnerability_impacted_containers(self, vulnerability_id, **kwargs): "page": kwargs.get("page", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6109,7 +6108,7 @@ def list_vulnerability_impacted_hosts(self, vulnerability_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_vulnerability_impacted_hosts got unknown kwargs: {extra_kwargs!r}") @@ -6118,10 +6117,10 @@ def list_vulnerability_impacted_hosts(self, vulnerability_id, **kwargs): "vulnerabilityId": vulnerability_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -6144,14 +6143,14 @@ def list_vulnerability_impacted_hosts(self, vulnerability_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6237,7 +6236,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -6246,24 +6245,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6349,7 +6348,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -6358,24 +6357,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6461,7 +6460,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -6471,14 +6470,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6565,7 +6564,7 @@ def update_container_scan_recipe(self, container_scan_recipe_id, update_containe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -6574,10 +6573,10 @@ def update_container_scan_recipe(self, container_scan_recipe_id, update_containe "containerScanRecipeId": container_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6586,7 +6585,7 @@ def update_container_scan_recipe(self, container_scan_recipe_id, update_containe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6673,7 +6672,7 @@ def update_container_scan_target(self, container_scan_target_id, update_containe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_container_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -6682,10 +6681,10 @@ def update_container_scan_target(self, container_scan_target_id, update_containe "containerScanTargetId": container_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6694,7 +6693,7 @@ def update_container_scan_target(self, container_scan_target_id, update_containe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6781,7 +6780,7 @@ def update_host_scan_recipe(self, host_scan_recipe_id, update_host_scan_recipe_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_host_scan_recipe got unknown kwargs: {extra_kwargs!r}") @@ -6790,10 +6789,10 @@ def update_host_scan_recipe(self, host_scan_recipe_id, update_host_scan_recipe_d "hostScanRecipeId": host_scan_recipe_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6802,7 +6801,7 @@ def update_host_scan_recipe(self, host_scan_recipe_id, update_host_scan_recipe_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6889,7 +6888,7 @@ def update_host_scan_target(self, host_scan_target_id, update_host_scan_target_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_host_scan_target got unknown kwargs: {extra_kwargs!r}") @@ -6898,10 +6897,10 @@ def update_host_scan_target(self, host_scan_target_id, update_host_scan_target_d "hostScanTargetId": host_scan_target_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6910,7 +6909,7 @@ def update_host_scan_target(self, host_scan_target_id, update_host_scan_target_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/waa/waa_client.py b/src/oci/waa/waa_client.py index f9a700fce8..5bbe14e3ec 100644 --- a/src/oci/waa/waa_client.py +++ b/src/oci/waa/waa_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -172,7 +171,7 @@ def change_web_app_acceleration_compartment(self, web_app_acceleration_id, chang "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_web_app_acceleration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def change_web_app_acceleration_compartment(self, web_app_acceleration_id, chang "webAppAccelerationId": web_app_acceleration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -193,7 +192,7 @@ def change_web_app_acceleration_compartment(self, web_app_acceleration_id, chang "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -281,7 +280,7 @@ def change_web_app_acceleration_policy_compartment(self, web_app_acceleration_po "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_web_app_acceleration_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def change_web_app_acceleration_policy_compartment(self, web_app_acceleration_po "webAppAccelerationPolicyId": web_app_acceleration_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -302,7 +301,7 @@ def change_web_app_acceleration_policy_compartment(self, web_app_acceleration_po "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -385,7 +384,7 @@ def create_web_app_acceleration(self, create_web_app_acceleration_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_web_app_acceleration got unknown kwargs: {extra_kwargs!r}") @@ -396,7 +395,7 @@ def create_web_app_acceleration(self, create_web_app_acceleration_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -480,7 +479,7 @@ def create_web_app_acceleration_policy(self, create_web_app_acceleration_policy_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_web_app_acceleration_policy got unknown kwargs: {extra_kwargs!r}") @@ -491,7 +490,7 @@ def create_web_app_acceleration_policy(self, create_web_app_acceleration_policy_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -576,7 +575,7 @@ def delete_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_web_app_acceleration got unknown kwargs: {extra_kwargs!r}") @@ -585,10 +584,10 @@ def delete_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "webAppAccelerationId": web_app_acceleration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -597,7 +596,7 @@ def delete_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -679,7 +678,7 @@ def delete_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **k "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_web_app_acceleration_policy got unknown kwargs: {extra_kwargs!r}") @@ -688,10 +687,10 @@ def delete_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **k "webAppAccelerationPolicyId": web_app_acceleration_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -700,7 +699,7 @@ def delete_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **k "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -776,7 +775,7 @@ def get_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_web_app_acceleration got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def get_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "webAppAccelerationId": web_app_acceleration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -796,7 +795,7 @@ def get_web_app_acceleration(self, web_app_acceleration_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -874,7 +873,7 @@ def get_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **kwar "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_web_app_acceleration_policy got unknown kwargs: {extra_kwargs!r}") @@ -883,10 +882,10 @@ def get_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **kwar "webAppAccelerationPolicyId": web_app_acceleration_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -894,7 +893,7 @@ def get_web_app_acceleration_policy(self, web_app_acceleration_policy_id, **kwar "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1010,7 +1009,7 @@ def list_web_app_acceleration_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_web_app_acceleration_policies got unknown kwargs: {extra_kwargs!r}") @@ -1039,14 +1038,14 @@ def list_web_app_acceleration_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1169,7 +1168,7 @@ def list_web_app_accelerations(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_web_app_accelerations got unknown kwargs: {extra_kwargs!r}") @@ -1199,14 +1198,14 @@ def list_web_app_accelerations(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1288,7 +1287,7 @@ def purge_web_app_acceleration_cache(self, web_app_acceleration_id, purge_web_ap "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"purge_web_app_acceleration_cache got unknown kwargs: {extra_kwargs!r}") @@ -1297,10 +1296,10 @@ def purge_web_app_acceleration_cache(self, web_app_acceleration_id, purge_web_ap "webAppAccelerationId": web_app_acceleration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1308,7 +1307,7 @@ def purge_web_app_acceleration_cache(self, web_app_acceleration_id, purge_web_ap "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1395,7 +1394,7 @@ def update_web_app_acceleration(self, web_app_acceleration_id, update_web_app_ac "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_web_app_acceleration got unknown kwargs: {extra_kwargs!r}") @@ -1404,10 +1403,10 @@ def update_web_app_acceleration(self, web_app_acceleration_id, update_web_app_ac "webAppAccelerationId": web_app_acceleration_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1416,7 +1415,7 @@ def update_web_app_acceleration(self, web_app_acceleration_id, update_web_app_ac "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1503,7 +1502,7 @@ def update_web_app_acceleration_policy(self, web_app_acceleration_policy_id, upd "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_web_app_acceleration_policy got unknown kwargs: {extra_kwargs!r}") @@ -1512,10 +1511,10 @@ def update_web_app_acceleration_policy(self, web_app_acceleration_policy_id, upd "webAppAccelerationPolicyId": web_app_acceleration_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1524,7 +1523,7 @@ def update_web_app_acceleration_policy(self, web_app_acceleration_policy_id, upd "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/waa/work_request_client.py b/src/oci/waa/work_request_client.py index 6292a0d9e3..25ebc37f4d 100644 --- a/src/oci/waa/work_request_client.py +++ b/src/oci/waa/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -162,7 +161,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -171,10 +170,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -182,7 +181,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -269,7 +268,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -278,24 +277,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -384,7 +383,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -393,24 +392,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -505,7 +504,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -516,14 +515,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/waas/redirect_client.py b/src/oci/waas/redirect_client.py index a5bcd54efe..95b26f8544 100644 --- a/src/oci/waas/redirect_client.py +++ b/src/oci/waas/redirect_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -171,7 +170,7 @@ def change_http_redirect_compartment(self, http_redirect_id, change_http_redirec "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_http_redirect_compartment got unknown kwargs: {extra_kwargs!r}") @@ -180,10 +179,10 @@ def change_http_redirect_compartment(self, http_redirect_id, change_http_redirec "httpRedirectId": http_redirect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -193,7 +192,7 @@ def change_http_redirect_compartment(self, http_redirect_id, change_http_redirec "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -275,7 +274,7 @@ def create_http_redirect(self, create_http_redirect_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_http_redirect got unknown kwargs: {extra_kwargs!r}") @@ -286,7 +285,7 @@ def create_http_redirect(self, create_http_redirect_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -372,7 +371,7 @@ def delete_http_redirect(self, http_redirect_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_http_redirect got unknown kwargs: {extra_kwargs!r}") @@ -381,10 +380,10 @@ def delete_http_redirect(self, http_redirect_id, **kwargs): "httpRedirectId": http_redirect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -394,7 +393,7 @@ def delete_http_redirect(self, http_redirect_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -471,7 +470,7 @@ def get_http_redirect(self, http_redirect_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_http_redirect got unknown kwargs: {extra_kwargs!r}") @@ -480,10 +479,10 @@ def get_http_redirect(self, http_redirect_id, **kwargs): "httpRedirectId": http_redirect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -491,7 +490,7 @@ def get_http_redirect(self, http_redirect_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -613,7 +612,7 @@ def list_http_redirects(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_http_redirects got unknown kwargs: {extra_kwargs!r}") @@ -652,14 +651,14 @@ def list_http_redirects(self, compartment_id, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "timeCreatedLessThan": kwargs.get("time_created_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -751,7 +750,7 @@ def update_http_redirect(self, http_redirect_id, update_http_redirect_details, * "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_http_redirect got unknown kwargs: {extra_kwargs!r}") @@ -760,10 +759,10 @@ def update_http_redirect(self, http_redirect_id, update_http_redirect_details, * "httpRedirectId": http_redirect_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -773,7 +772,7 @@ def update_http_redirect(self, http_redirect_id, update_http_redirect_details, * "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/waas/waas_client.py b/src/oci/waas/waas_client.py index ee39703836..6b41db7b44 100644 --- a/src/oci/waas/waas_client.py +++ b/src/oci/waas/waas_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -170,7 +169,7 @@ def accept_recommendations(self, waas_policy_id, protection_rule_keys, **kwargs) "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"accept_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def accept_recommendations(self, waas_policy_id, protection_rule_keys, **kwargs) "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -191,7 +190,7 @@ def accept_recommendations(self, waas_policy_id, protection_rule_keys, **kwargs) "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -278,7 +277,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"cancel_work_request got unknown kwargs: {extra_kwargs!r}") @@ -287,10 +286,10 @@ def cancel_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -300,7 +299,7 @@ def cancel_work_request(self, work_request_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -392,7 +391,7 @@ def change_address_list_compartment(self, address_list_id, change_address_list_c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_address_list_compartment got unknown kwargs: {extra_kwargs!r}") @@ -401,10 +400,10 @@ def change_address_list_compartment(self, address_list_id, change_address_list_c "addressListId": address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def change_address_list_compartment(self, address_list_id, change_address_list_c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -507,7 +506,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_certificate_compartment got unknown kwargs: {extra_kwargs!r}") @@ -516,10 +515,10 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -529,7 +528,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -621,7 +620,7 @@ def change_custom_protection_rule_compartment(self, custom_protection_rule_id, c "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_custom_protection_rule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -630,10 +629,10 @@ def change_custom_protection_rule_compartment(self, custom_protection_rule_id, c "customProtectionRuleId": custom_protection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -643,7 +642,7 @@ def change_custom_protection_rule_compartment(self, custom_protection_rule_id, c "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -736,7 +735,7 @@ def change_waas_policy_compartment(self, waas_policy_id, change_waas_policy_comp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_waas_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -745,10 +744,10 @@ def change_waas_policy_compartment(self, waas_policy_id, change_waas_policy_comp "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -758,7 +757,7 @@ def change_waas_policy_compartment(self, waas_policy_id, change_waas_policy_comp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -840,7 +839,7 @@ def create_address_list(self, create_address_list_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_address_list got unknown kwargs: {extra_kwargs!r}") @@ -851,7 +850,7 @@ def create_address_list(self, create_address_list_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -937,7 +936,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -948,7 +947,7 @@ def create_certificate(self, create_certificate_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1035,7 +1034,7 @@ def create_custom_protection_rule(self, create_custom_protection_rule_details, * "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_custom_protection_rule got unknown kwargs: {extra_kwargs!r}") @@ -1046,7 +1045,7 @@ def create_custom_protection_rule(self, create_custom_protection_rule_details, * "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1143,7 +1142,7 @@ def create_waas_policy(self, create_waas_policy_details, **kwargs): "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_waas_policy got unknown kwargs: {extra_kwargs!r}") @@ -1154,7 +1153,7 @@ def create_waas_policy(self, create_waas_policy_details, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1240,7 +1239,7 @@ def delete_address_list(self, address_list_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_address_list got unknown kwargs: {extra_kwargs!r}") @@ -1249,10 +1248,10 @@ def delete_address_list(self, address_list_id, **kwargs): "addressListId": address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1262,7 +1261,7 @@ def delete_address_list(self, address_list_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1348,7 +1347,7 @@ def delete_certificate(self, certificate_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1357,10 +1356,10 @@ def delete_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1370,7 +1369,7 @@ def delete_certificate(self, certificate_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1456,7 +1455,7 @@ def delete_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_custom_protection_rule got unknown kwargs: {extra_kwargs!r}") @@ -1465,10 +1464,10 @@ def delete_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "customProtectionRuleId": custom_protection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1478,7 +1477,7 @@ def delete_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1564,7 +1563,7 @@ def delete_waas_policy(self, waas_policy_id, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_waas_policy got unknown kwargs: {extra_kwargs!r}") @@ -1573,10 +1572,10 @@ def delete_waas_policy(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1586,7 +1585,7 @@ def delete_waas_policy(self, waas_policy_id, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1663,7 +1662,7 @@ def get_address_list(self, address_list_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_address_list got unknown kwargs: {extra_kwargs!r}") @@ -1672,10 +1671,10 @@ def get_address_list(self, address_list_id, **kwargs): "addressListId": address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1683,7 +1682,7 @@ def get_address_list(self, address_list_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1763,7 +1762,7 @@ def get_certificate(self, certificate_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1772,10 +1771,10 @@ def get_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1783,7 +1782,7 @@ def get_certificate(self, certificate_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1863,7 +1862,7 @@ def get_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_custom_protection_rule got unknown kwargs: {extra_kwargs!r}") @@ -1872,10 +1871,10 @@ def get_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "customProtectionRuleId": custom_protection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1883,7 +1882,7 @@ def get_custom_protection_rule(self, custom_protection_rule_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1963,7 +1962,7 @@ def get_device_fingerprint_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_device_fingerprint_challenge got unknown kwargs: {extra_kwargs!r}") @@ -1972,10 +1971,10 @@ def get_device_fingerprint_challenge(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1983,7 +1982,7 @@ def get_device_fingerprint_challenge(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2063,7 +2062,7 @@ def get_human_interaction_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_human_interaction_challenge got unknown kwargs: {extra_kwargs!r}") @@ -2072,10 +2071,10 @@ def get_human_interaction_challenge(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2083,7 +2082,7 @@ def get_human_interaction_challenge(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2163,7 +2162,7 @@ def get_js_challenge(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_js_challenge got unknown kwargs: {extra_kwargs!r}") @@ -2172,10 +2171,10 @@ def get_js_challenge(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2183,7 +2182,7 @@ def get_js_challenge(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2263,7 +2262,7 @@ def get_policy_config(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_policy_config got unknown kwargs: {extra_kwargs!r}") @@ -2272,10 +2271,10 @@ def get_policy_config(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2283,7 +2282,7 @@ def get_policy_config(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2366,7 +2365,7 @@ def get_protection_rule(self, waas_policy_id, protection_rule_key, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_protection_rule got unknown kwargs: {extra_kwargs!r}") @@ -2376,10 +2375,10 @@ def get_protection_rule(self, waas_policy_id, protection_rule_key, **kwargs): "protectionRuleKey": protection_rule_key } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2387,7 +2386,7 @@ def get_protection_rule(self, waas_policy_id, protection_rule_key, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2467,7 +2466,7 @@ def get_protection_settings(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_protection_settings got unknown kwargs: {extra_kwargs!r}") @@ -2476,10 +2475,10 @@ def get_protection_settings(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2487,7 +2486,7 @@ def get_protection_settings(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2567,7 +2566,7 @@ def get_waas_policy(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_waas_policy got unknown kwargs: {extra_kwargs!r}") @@ -2576,10 +2575,10 @@ def get_waas_policy(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2587,7 +2586,7 @@ def get_waas_policy(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2667,7 +2666,7 @@ def get_waf_address_rate_limiting(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_waf_address_rate_limiting got unknown kwargs: {extra_kwargs!r}") @@ -2676,10 +2675,10 @@ def get_waf_address_rate_limiting(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2687,7 +2686,7 @@ def get_waf_address_rate_limiting(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2767,7 +2766,7 @@ def get_waf_config(self, waas_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_waf_config got unknown kwargs: {extra_kwargs!r}") @@ -2776,10 +2775,10 @@ def get_waf_config(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2787,7 +2786,7 @@ def get_waf_config(self, waas_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2867,7 +2866,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -2876,10 +2875,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2887,7 +2886,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2976,7 +2975,7 @@ def list_access_rules(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_access_rules got unknown kwargs: {extra_kwargs!r}") @@ -2985,24 +2984,24 @@ def list_access_rules(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3126,7 +3125,7 @@ def list_address_lists(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_address_lists got unknown kwargs: {extra_kwargs!r}") @@ -3165,14 +3164,14 @@ def list_address_lists(self, compartment_id, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "timeCreatedLessThan": kwargs.get("time_created_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3261,7 +3260,7 @@ def list_caching_rules(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_caching_rules got unknown kwargs: {extra_kwargs!r}") @@ -3270,24 +3269,24 @@ def list_caching_rules(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3381,7 +3380,7 @@ def list_captchas(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_captchas got unknown kwargs: {extra_kwargs!r}") @@ -3390,24 +3389,24 @@ def list_captchas(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3531,7 +3530,7 @@ def list_certificates(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_certificates got unknown kwargs: {extra_kwargs!r}") @@ -3570,14 +3569,14 @@ def list_certificates(self, compartment_id, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "timeCreatedLessThan": kwargs.get("time_created_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3699,7 +3698,7 @@ def list_custom_protection_rules(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_custom_protection_rules got unknown kwargs: {extra_kwargs!r}") @@ -3738,14 +3737,14 @@ def list_custom_protection_rules(self, compartment_id, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "timeCreatedLessThan": kwargs.get("time_created_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3840,7 +3839,7 @@ def list_edge_subnets(self, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_edge_subnets got unknown kwargs: {extra_kwargs!r}") @@ -3865,14 +3864,14 @@ def list_edge_subnets(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3962,7 +3961,7 @@ def list_good_bots(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_good_bots got unknown kwargs: {extra_kwargs!r}") @@ -3971,24 +3970,24 @@ def list_good_bots(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4089,7 +4088,7 @@ def list_protection_rules(self, waas_policy_id, **kwargs): "mod_security_rule_id", "action" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protection_rules got unknown kwargs: {extra_kwargs!r}") @@ -4098,10 +4097,10 @@ def list_protection_rules(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'action' in kwargs: @@ -4118,14 +4117,14 @@ def list_protection_rules(self, waas_policy_id, **kwargs): "modSecurityRuleId": self.base_client.generate_collection_format_param(kwargs.get("mod_security_rule_id", missing), 'multi'), "action": self.base_client.generate_collection_format_param(kwargs.get("action", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4226,7 +4225,7 @@ def list_recommendations(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_recommendations got unknown kwargs: {extra_kwargs!r}") @@ -4235,10 +4234,10 @@ def list_recommendations(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'recommended_action' in kwargs: @@ -4253,14 +4252,14 @@ def list_recommendations(self, waas_policy_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4352,7 +4351,7 @@ def list_threat_feeds(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_threat_feeds got unknown kwargs: {extra_kwargs!r}") @@ -4361,24 +4360,24 @@ def list_threat_feeds(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4502,7 +4501,7 @@ def list_waas_policies(self, compartment_id, **kwargs): "time_created_greater_than_or_equal_to", "time_created_less_than" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waas_policies got unknown kwargs: {extra_kwargs!r}") @@ -4541,14 +4540,14 @@ def list_waas_policies(self, compartment_id, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "timeCreatedLessThan": kwargs.get("time_created_less_than", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4646,7 +4645,7 @@ def list_waas_policy_custom_protection_rules(self, waas_policy_id, **kwargs): "mod_security_rule_id", "action" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waas_policy_custom_protection_rules got unknown kwargs: {extra_kwargs!r}") @@ -4655,10 +4654,10 @@ def list_waas_policy_custom_protection_rules(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'action' in kwargs: @@ -4675,14 +4674,14 @@ def list_waas_policy_custom_protection_rules(self, waas_policy_id, **kwargs): "modSecurityRuleId": self.base_client.generate_collection_format_param(kwargs.get("mod_security_rule_id", missing), 'multi'), "action": self.base_client.generate_collection_format_param(kwargs.get("action", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4786,7 +4785,7 @@ def list_waf_blocked_requests(self, waas_policy_id, **kwargs): "page", "waf_feature" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waf_blocked_requests got unknown kwargs: {extra_kwargs!r}") @@ -4795,10 +4794,10 @@ def list_waf_blocked_requests(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'waf_feature' in kwargs: @@ -4816,14 +4815,14 @@ def list_waf_blocked_requests(self, waas_policy_id, **kwargs): "page": kwargs.get("page", missing), "wafFeature": self.base_client.generate_collection_format_param(kwargs.get("waf_feature", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5001,7 +5000,7 @@ def list_waf_logs(self, waas_policy_id, **kwargs): "user_agent", "protection_rule_key" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waf_logs got unknown kwargs: {extra_kwargs!r}") @@ -5010,10 +5009,10 @@ def list_waf_logs(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'action' in kwargs: @@ -5063,14 +5062,14 @@ def list_waf_logs(self, waas_policy_id, **kwargs): "userAgent": self.base_client.generate_collection_format_param(kwargs.get("user_agent", missing), 'multi'), "protectionRuleKey": self.base_client.generate_collection_format_param(kwargs.get("protection_rule_key", missing), 'multi') } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5170,7 +5169,7 @@ def list_waf_requests(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waf_requests got unknown kwargs: {extra_kwargs!r}") @@ -5179,10 +5178,10 @@ def list_waf_requests(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -5191,14 +5190,14 @@ def list_waf_requests(self, waas_policy_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5297,7 +5296,7 @@ def list_waf_traffic(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_waf_traffic got unknown kwargs: {extra_kwargs!r}") @@ -5306,10 +5305,10 @@ def list_waf_traffic(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -5318,14 +5317,14 @@ def list_waf_traffic(self, waas_policy_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5415,7 +5414,7 @@ def list_whitelists(self, waas_policy_id, **kwargs): "limit", "page" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_whitelists got unknown kwargs: {extra_kwargs!r}") @@ -5424,24 +5423,24 @@ def list_whitelists(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5548,7 +5547,7 @@ def list_work_requests(self, waas_policy_id, compartment_id, **kwargs): "sort_by", "sort_order" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -5575,14 +5574,14 @@ def list_work_requests(self, waas_policy_id, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5672,7 +5671,7 @@ def purge_cache(self, waas_policy_id, **kwargs): "if_match", "purge_cache" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"purge_cache got unknown kwargs: {extra_kwargs!r}") @@ -5681,10 +5680,10 @@ def purge_cache(self, waas_policy_id, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5693,7 +5692,7 @@ def purge_cache(self, waas_policy_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5790,7 +5789,7 @@ def update_access_rules(self, waas_policy_id, access_rules, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_access_rules got unknown kwargs: {extra_kwargs!r}") @@ -5799,10 +5798,10 @@ def update_access_rules(self, waas_policy_id, access_rules, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5812,7 +5811,7 @@ def update_access_rules(self, waas_policy_id, access_rules, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5899,7 +5898,7 @@ def update_address_list(self, address_list_id, **kwargs): "if_match", "update_address_list_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_address_list got unknown kwargs: {extra_kwargs!r}") @@ -5908,10 +5907,10 @@ def update_address_list(self, address_list_id, **kwargs): "addressListId": address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -5920,7 +5919,7 @@ def update_address_list(self, address_list_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6019,7 +6018,7 @@ def update_caching_rules(self, waas_policy_id, caching_rules_details, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_caching_rules got unknown kwargs: {extra_kwargs!r}") @@ -6028,10 +6027,10 @@ def update_caching_rules(self, waas_policy_id, caching_rules_details, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6041,7 +6040,7 @@ def update_caching_rules(self, waas_policy_id, caching_rules_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6140,7 +6139,7 @@ def update_captchas(self, waas_policy_id, captchas, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_captchas got unknown kwargs: {extra_kwargs!r}") @@ -6149,10 +6148,10 @@ def update_captchas(self, waas_policy_id, captchas, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6162,7 +6161,7 @@ def update_captchas(self, waas_policy_id, captchas, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6249,7 +6248,7 @@ def update_certificate(self, certificate_id, **kwargs): "if_match", "update_certificate_details" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_certificate got unknown kwargs: {extra_kwargs!r}") @@ -6258,10 +6257,10 @@ def update_certificate(self, certificate_id, **kwargs): "certificateId": certificate_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6270,7 +6269,7 @@ def update_certificate(self, certificate_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6362,7 +6361,7 @@ def update_custom_protection_rule(self, custom_protection_rule_id, update_custom "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_custom_protection_rule got unknown kwargs: {extra_kwargs!r}") @@ -6371,10 +6370,10 @@ def update_custom_protection_rule(self, custom_protection_rule_id, update_custom "customProtectionRuleId": custom_protection_rule_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6384,7 +6383,7 @@ def update_custom_protection_rule(self, custom_protection_rule_id, update_custom "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6481,7 +6480,7 @@ def update_device_fingerprint_challenge(self, waas_policy_id, update_device_fing "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_device_fingerprint_challenge got unknown kwargs: {extra_kwargs!r}") @@ -6490,10 +6489,10 @@ def update_device_fingerprint_challenge(self, waas_policy_id, update_device_fing "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6503,7 +6502,7 @@ def update_device_fingerprint_challenge(self, waas_policy_id, update_device_fing "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6597,7 +6596,7 @@ def update_good_bots(self, waas_policy_id, good_bots, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_good_bots got unknown kwargs: {extra_kwargs!r}") @@ -6606,10 +6605,10 @@ def update_good_bots(self, waas_policy_id, good_bots, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6619,7 +6618,7 @@ def update_good_bots(self, waas_policy_id, good_bots, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6710,7 +6709,7 @@ def update_human_interaction_challenge(self, waas_policy_id, update_human_intera "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_human_interaction_challenge got unknown kwargs: {extra_kwargs!r}") @@ -6719,10 +6718,10 @@ def update_human_interaction_challenge(self, waas_policy_id, update_human_intera "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6732,7 +6731,7 @@ def update_human_interaction_challenge(self, waas_policy_id, update_human_intera "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6825,7 +6824,7 @@ def update_js_challenge(self, waas_policy_id, update_js_challenge_details, **kwa "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_js_challenge got unknown kwargs: {extra_kwargs!r}") @@ -6834,10 +6833,10 @@ def update_js_challenge(self, waas_policy_id, update_js_challenge_details, **kwa "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6847,7 +6846,7 @@ def update_js_challenge(self, waas_policy_id, update_js_challenge_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6938,7 +6937,7 @@ def update_policy_config(self, waas_policy_id, update_policy_config_details, **k "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_policy_config got unknown kwargs: {extra_kwargs!r}") @@ -6947,10 +6946,10 @@ def update_policy_config(self, waas_policy_id, update_policy_config_details, **k "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6960,7 +6959,7 @@ def update_policy_config(self, waas_policy_id, update_policy_config_details, **k "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7049,7 +7048,7 @@ def update_protection_rules(self, waas_policy_id, protection_rules, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_protection_rules got unknown kwargs: {extra_kwargs!r}") @@ -7058,10 +7057,10 @@ def update_protection_rules(self, waas_policy_id, protection_rules, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7070,7 +7069,7 @@ def update_protection_rules(self, waas_policy_id, protection_rules, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7160,7 +7159,7 @@ def update_protection_settings(self, waas_policy_id, update_protection_settings_ "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_protection_settings got unknown kwargs: {extra_kwargs!r}") @@ -7169,10 +7168,10 @@ def update_protection_settings(self, waas_policy_id, update_protection_settings_ "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7182,7 +7181,7 @@ def update_protection_settings(self, waas_policy_id, update_protection_settings_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7268,7 +7267,7 @@ def update_threat_feeds(self, waas_policy_id, threat_feeds, **kwargs): "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_threat_feeds got unknown kwargs: {extra_kwargs!r}") @@ -7277,10 +7276,10 @@ def update_threat_feeds(self, waas_policy_id, threat_feeds, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7289,7 +7288,7 @@ def update_threat_feeds(self, waas_policy_id, threat_feeds, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7381,7 +7380,7 @@ def update_waas_policy(self, waas_policy_id, update_waas_policy_details, **kwarg "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_waas_policy got unknown kwargs: {extra_kwargs!r}") @@ -7390,10 +7389,10 @@ def update_waas_policy(self, waas_policy_id, update_waas_policy_details, **kwarg "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7403,7 +7402,7 @@ def update_waas_policy(self, waas_policy_id, update_waas_policy_details, **kwarg "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7495,7 +7494,7 @@ def update_waas_policy_custom_protection_rules(self, waas_policy_id, update_cust "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_waas_policy_custom_protection_rules got unknown kwargs: {extra_kwargs!r}") @@ -7504,10 +7503,10 @@ def update_waas_policy_custom_protection_rules(self, waas_policy_id, update_cust "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7517,7 +7516,7 @@ def update_waas_policy_custom_protection_rules(self, waas_policy_id, update_cust "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7608,7 +7607,7 @@ def update_waf_address_rate_limiting(self, waas_policy_id, update_waf_address_ra "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_waf_address_rate_limiting got unknown kwargs: {extra_kwargs!r}") @@ -7617,10 +7616,10 @@ def update_waf_address_rate_limiting(self, waas_policy_id, update_waf_address_ra "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7630,7 +7629,7 @@ def update_waf_address_rate_limiting(self, waas_policy_id, update_waf_address_ra "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7728,7 +7727,7 @@ def update_waf_config(self, waas_policy_id, update_waf_config_details, **kwargs) "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_waf_config got unknown kwargs: {extra_kwargs!r}") @@ -7737,10 +7736,10 @@ def update_waf_config(self, waas_policy_id, update_waf_config_details, **kwargs) "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7750,7 +7749,7 @@ def update_waf_config(self, waas_policy_id, update_waf_config_details, **kwargs) "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7848,7 +7847,7 @@ def update_whitelists(self, waas_policy_id, whitelists, **kwargs): "opc_retry_token", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_whitelists got unknown kwargs: {extra_kwargs!r}") @@ -7857,10 +7856,10 @@ def update_whitelists(self, waas_policy_id, whitelists, **kwargs): "waasPolicyId": waas_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7870,7 +7869,7 @@ def update_whitelists(self, waas_policy_id, whitelists, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/waf/waf_client.py b/src/oci/waf/waf_client.py index 33db9badb0..8b928f4839 100644 --- a/src/oci/waf/waf_client.py +++ b/src/oci/waf/waf_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -171,7 +170,7 @@ def change_network_address_list_compartment(self, network_address_list_id, chang "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_network_address_list_compartment got unknown kwargs: {extra_kwargs!r}") @@ -180,10 +179,10 @@ def change_network_address_list_compartment(self, network_address_list_id, chang "networkAddressListId": network_address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -192,7 +191,7 @@ def change_network_address_list_compartment(self, network_address_list_id, chang "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -282,7 +281,7 @@ def change_web_app_firewall_compartment(self, web_app_firewall_id, change_web_ap "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_web_app_firewall_compartment got unknown kwargs: {extra_kwargs!r}") @@ -291,10 +290,10 @@ def change_web_app_firewall_compartment(self, web_app_firewall_id, change_web_ap "webAppFirewallId": web_app_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -303,7 +302,7 @@ def change_web_app_firewall_compartment(self, web_app_firewall_id, change_web_ap "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -393,7 +392,7 @@ def change_web_app_firewall_policy_compartment(self, web_app_firewall_policy_id, "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_web_app_firewall_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -402,10 +401,10 @@ def change_web_app_firewall_policy_compartment(self, web_app_firewall_policy_id, "webAppFirewallPolicyId": web_app_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -414,7 +413,7 @@ def change_web_app_firewall_policy_compartment(self, web_app_firewall_policy_id, "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -499,7 +498,7 @@ def create_network_address_list(self, create_network_address_list_details, **kwa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_network_address_list got unknown kwargs: {extra_kwargs!r}") @@ -510,7 +509,7 @@ def create_network_address_list(self, create_network_address_list_details, **kwa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -596,7 +595,7 @@ def create_web_app_firewall(self, create_web_app_firewall_details, **kwargs): "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_web_app_firewall got unknown kwargs: {extra_kwargs!r}") @@ -607,7 +606,7 @@ def create_web_app_firewall(self, create_web_app_firewall_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -693,7 +692,7 @@ def create_web_app_firewall_policy(self, create_web_app_firewall_policy_details, "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_web_app_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -704,7 +703,7 @@ def create_web_app_firewall_policy(self, create_web_app_firewall_policy_details, "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -791,7 +790,7 @@ def delete_network_address_list(self, network_address_list_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_network_address_list got unknown kwargs: {extra_kwargs!r}") @@ -800,10 +799,10 @@ def delete_network_address_list(self, network_address_list_id, **kwargs): "networkAddressListId": network_address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -812,7 +811,7 @@ def delete_network_address_list(self, network_address_list_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -896,7 +895,7 @@ def delete_web_app_firewall(self, web_app_firewall_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_web_app_firewall got unknown kwargs: {extra_kwargs!r}") @@ -905,10 +904,10 @@ def delete_web_app_firewall(self, web_app_firewall_id, **kwargs): "webAppFirewallId": web_app_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -917,7 +916,7 @@ def delete_web_app_firewall(self, web_app_firewall_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1001,7 +1000,7 @@ def delete_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_web_app_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -1010,10 +1009,10 @@ def delete_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "webAppFirewallPolicyId": web_app_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1022,7 +1021,7 @@ def delete_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1100,7 +1099,7 @@ def get_network_address_list(self, network_address_list_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_network_address_list got unknown kwargs: {extra_kwargs!r}") @@ -1109,10 +1108,10 @@ def get_network_address_list(self, network_address_list_id, **kwargs): "networkAddressListId": network_address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1120,7 +1119,7 @@ def get_network_address_list(self, network_address_list_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1200,7 +1199,7 @@ def get_web_app_firewall(self, web_app_firewall_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_web_app_firewall got unknown kwargs: {extra_kwargs!r}") @@ -1209,10 +1208,10 @@ def get_web_app_firewall(self, web_app_firewall_id, **kwargs): "webAppFirewallId": web_app_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1220,7 +1219,7 @@ def get_web_app_firewall(self, web_app_firewall_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1300,7 +1299,7 @@ def get_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_web_app_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -1309,10 +1308,10 @@ def get_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "webAppFirewallPolicyId": web_app_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1320,7 +1319,7 @@ def get_web_app_firewall_policy(self, web_app_firewall_policy_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1400,7 +1399,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1409,10 +1408,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1420,7 +1419,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1538,7 +1537,7 @@ def list_network_address_lists(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_network_address_lists got unknown kwargs: {extra_kwargs!r}") @@ -1567,14 +1566,14 @@ def list_network_address_lists(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1701,7 +1700,7 @@ def list_protection_capabilities(self, compartment_id, **kwargs): "sort_order", "sort_by" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protection_capabilities got unknown kwargs: {extra_kwargs!r}") @@ -1739,14 +1738,14 @@ def list_protection_capabilities(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1859,7 +1858,7 @@ def list_protection_capability_group_tags(self, compartment_id, **kwargs): "sort_by", "name" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_protection_capability_group_tags got unknown kwargs: {extra_kwargs!r}") @@ -1894,14 +1893,14 @@ def list_protection_capability_group_tags(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "name": kwargs.get("name", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2019,7 +2018,7 @@ def list_web_app_firewall_policies(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_web_app_firewall_policies got unknown kwargs: {extra_kwargs!r}") @@ -2048,14 +2047,14 @@ def list_web_app_firewall_policies(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2179,7 +2178,7 @@ def list_web_app_firewalls(self, compartment_id, **kwargs): "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_web_app_firewalls got unknown kwargs: {extra_kwargs!r}") @@ -2209,14 +2208,14 @@ def list_web_app_firewalls(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2305,7 +2304,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -2314,24 +2313,24 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2422,7 +2421,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -2431,24 +2430,24 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2545,7 +2544,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "limit" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -2556,14 +2555,14 @@ def list_work_requests(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "limit": kwargs.get("limit", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2652,7 +2651,7 @@ def update_network_address_list(self, network_address_list_id, update_network_ad "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_network_address_list got unknown kwargs: {extra_kwargs!r}") @@ -2661,10 +2660,10 @@ def update_network_address_list(self, network_address_list_id, update_network_ad "networkAddressListId": network_address_list_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2673,7 +2672,7 @@ def update_network_address_list(self, network_address_list_id, update_network_ad "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2762,7 +2761,7 @@ def update_web_app_firewall(self, web_app_firewall_id, update_web_app_firewall_d "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_web_app_firewall got unknown kwargs: {extra_kwargs!r}") @@ -2771,10 +2770,10 @@ def update_web_app_firewall(self, web_app_firewall_id, update_web_app_firewall_d "webAppFirewallId": web_app_firewall_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2783,7 +2782,7 @@ def update_web_app_firewall(self, web_app_firewall_id, update_web_app_firewall_d "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2872,7 +2871,7 @@ def update_web_app_firewall_policy(self, web_app_firewall_policy_id, update_web_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_web_app_firewall_policy got unknown kwargs: {extra_kwargs!r}") @@ -2881,10 +2880,10 @@ def update_web_app_firewall_policy(self, web_app_firewall_policy_id, update_web_ "webAppFirewallPolicyId": web_app_firewall_policy_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2893,7 +2892,7 @@ def update_web_app_firewall_policy(self, web_app_firewall_policy_id, update_web_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/src/oci/work_requests/work_request_client.py b/src/oci/work_requests/work_request_client.py index 2e3227de2c..426b581734 100644 --- a/src/oci/work_requests/work_request_client.py +++ b/src/oci/work_requests/work_request_client.py @@ -7,7 +7,6 @@ from __future__ import absolute_import from oci._vendor import requests # noqa: F401 -from oci._vendor import six from oci import retry, circuit_breaker # noqa: F401 from oci.base_client import BaseClient @@ -166,7 +165,7 @@ def get_work_request(self, work_request_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_work_request got unknown kwargs: {extra_kwargs!r}") @@ -175,10 +174,10 @@ def get_work_request(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -186,7 +185,7 @@ def get_work_request(self, work_request_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -287,7 +286,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def list_work_request_errors(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -314,14 +313,14 @@ def list_work_request_errors(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -424,7 +423,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): "sort_order", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -433,10 +432,10 @@ def list_work_request_logs(self, work_request_id, **kwargs): "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'sort_order' in kwargs: @@ -451,14 +450,14 @@ def list_work_request_logs(self, work_request_id, **kwargs): "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -561,7 +560,7 @@ def list_work_requests(self, compartment_id, **kwargs): "page", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -572,14 +571,14 @@ def list_work_requests(self, compartment_id, **kwargs): "limit": kwargs.get("limit", missing), "page": kwargs.get("page", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), diff --git a/tests/util.py b/tests/util.py index 59bbee07d4..fc11859bf9 100644 --- a/tests/util.py +++ b/tests/util.py @@ -12,7 +12,6 @@ from contextlib import contextmanager from oci._vendor.requests.exceptions import Timeout from oci._vendor.requests.exceptions import ConnectionError -from oci._vendor import six from . import test_config_container try: @@ -193,7 +192,7 @@ def camelize(to_camelize, uppercase_first_letter=False): # ignore_for_parent_keys will not convert the sub-nodes of that key in dictionary # such as for defineTag the key is defined by user, we don't want to covert it to camel case def make_dict_keys_camel_case(original_obj, ignore_for_parent_keys=None): - if isinstance(original_obj, six.string_types): + if isinstance(original_obj, str): return original_obj if not isinstance(original_obj, abc.Mapping) and not isinstance(original_obj, abc.Iterable): @@ -203,7 +202,7 @@ def make_dict_keys_camel_case(original_obj, ignore_for_parent_keys=None): if isinstance(original_obj, abc.Mapping): new_dict = {} - for key, value in six.iteritems(original_obj): + for key, value in original_obj.items(): camelized_key = camelize(key) if ignore_for_parent_keys is not None and camelized_key in ignore_for_parent_keys: